stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Server: quick delete fixie

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-09-21 11:14:53 +02:00
parent c65ce5373c
commit 79c21432b1
4 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectManagerImpl.java
View File

@@ -686,7 +686,7 @@ public class JObjectManagerImpl implements JObjectManager {
got.rwUnlock();
}
} else {
jObjectRefProcessor.putQuickDeletionCandidate(softJObjectFactory.create(got));
jObjectRefProcessor.putQuickDeletionCandidate(softJObjectFactory.create(this), softJObjectFactory.create(got));
}
}

53
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectRefProcessor.java
View File

@@ -12,6 +12,7 @@ import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.apache.commons.lang3.tuple.Pair;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import java.io.IOException;
@@ -22,7 +23,7 @@ import java.util.concurrent.TimeUnit;
@ApplicationScoped
public class JObjectRefProcessor {
private final HashSetDelayedBlockingQueue<SoftJObject<?>> _quickCandidates = new HashSetDelayedBlockingQueue<>(0);
private final HashSetDelayedBlockingQueue<Pair<SoftJObject<?>, SoftJObject<?>>> _quickCandidates = new HashSetDelayedBlockingQueue<>(0);
private final HashSetDelayedBlockingQueue<String> _candidates;
private final HashSetDelayedBlockingQueue<String> _canDeleteRetries;
private final HashSet<String> _movablesInProcessing = new HashSet<>();
@@ -85,8 +86,8 @@ public class JObjectRefProcessor {
}
}
public void putQuickDeletionCandidate(SoftJObject<?> obj) {
_quickCandidates.add(obj);
public void putQuickDeletionCandidate(SoftJObject<?> from, SoftJObject<?> obj) {
_quickCandidates.add(Pair.of(from, obj));
}
public void putDeletionCandidate(String name) {
@@ -181,24 +182,56 @@ public class JObjectRefProcessor {
try {
while (!Thread.interrupted()) {
String next = null;
SoftJObject<?> nextObj = null;
Pair<SoftJObject<?>, SoftJObject<?>> nextQuick = null;
while (next == null && nextObj == null) {
nextObj = _quickCandidates.tryGet();
while (next == null && nextQuick == null) {
nextQuick = _quickCandidates.tryGet();
if (nextObj != null) break;
if (nextQuick != null) break;
next = _canDeleteRetries.tryGet();
if (next == null)
next = _candidates.tryGet();
if (next == null)
nextObj = _quickCandidates.get(canDeleteRetryDelay);
nextQuick = _quickCandidates.get(canDeleteRetryDelay);
}
JObject<?> target;
if (nextObj != null) {
target = nextObj.get();
if (nextQuick != null) {
var fromSoft = nextQuick.getLeft();
var toSoft = nextQuick.getRight();
var from = nextQuick.getLeft().get();
var to = nextQuick.getRight().get();
if (from != null && !from.getMeta().isDeleted()) {
Log.warn("Quick delete failed for " + from.getMeta().getName() + " -> " + toSoft.getName());
continue;
}
if (to == null) {
Log.warn("Quick delete object missing: " + toSoft.getName());
continue;
}
target = to;
jObjectTxManager.executeTx(() -> {
if (from != null)
from.rwLock();
try {
try {
to.rwLock();
to.getMeta().removeRef(fromSoft.getName());
} finally {
to.rwUnlock();
}
} finally {
if (from != null)
from.rwUnlock();
}
});
} else {
target = jObjectManager.get(next).orElse(null);
}

1
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/SoftJObject.java
View File

@@ -2,4 +2,5 @@ package com.usatiuk.dhfs.objects.jrepository;
public interface SoftJObject<T extends JObjectData> {
JObject<T> get();
String getName();
}

4
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/SoftJObjectFactory.java
View File

@@ -50,6 +50,10 @@ public class SoftJObjectFactory {
}
}
@Override
public String getName() {
return _objName;
}
@Override
public boolean equals(Object o) {