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

fix deletion hanging

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-07-09 23:35:14 +02:00
parent 53565e82b3
commit eff12f59a7
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteObjectServiceClient.java
View File

@@ -15,9 +15,9 @@ import jakarta.inject.Inject;
import org.apache.commons.lang3.tuple.Pair;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@ApplicationScoped
public class RemoteObjectServiceClient {
@@ -133,22 +133,21 @@ public class RemoteObjectServiceClient {
public Collection<CanDeleteReply> canDelete(Collection<UUID> targets, String object, Collection<String> ourReferrers) {
ConcurrentLinkedDeque<CanDeleteReply> results = new ConcurrentLinkedDeque<>();
try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
targets.forEach(h -> executor.submit(() -> {
try {
var req = CanDeleteRequest.newBuilder()
.setSelfUuid(persistentRemoteHostsService.getSelfUuid().toString())
.setName(object);
req.addAllOurReferrers(ourReferrers);
var res = rpcClientFactory.withObjSyncClient(h, client -> client.canDelete(req.build()));
if (res != null)
results.add(res);
} catch (Exception e) {
Log.debug("Error when asking canDelete for object " + object, e);
}
}));
try {
if (!executor.awaitTermination(10, TimeUnit.SECONDS)) //FIXME:
Log.warn("Timed out waiting for canDelete for object " + object);
executor.invokeAll(targets.stream().<Callable<Void>>map(h -> () -> {
try {
var req = CanDeleteRequest.newBuilder()
.setSelfUuid(persistentRemoteHostsService.getSelfUuid().toString())
.setName(object);
req.addAllOurReferrers(ourReferrers);
var res = rpcClientFactory.withObjSyncClient(h, client -> client.canDelete(req.build()));
if (res != null)
results.add(res);
} catch (Exception e) {
Log.debug("Error when asking canDelete for object " + object, e);
}
return null;
}).toList());
} catch (InterruptedException e) {
Log.warn("Interrupted waiting for canDelete for object " + object);
}

1
server/src/main/resources/application.properties
View File

@@ -33,5 +33,6 @@ dhfs.objects.autosync.threads=2
dhfs.objects.autosync.download-all=false
dhfs.objects.move-processor.threads=2
quarkus.log.category."com.usatiuk.dhfs".min-level=TRACE
quarkus.log.category."com.usatiuk.dhfs".level=TRACE
quarkus.http.insecure-requests=enabled
quarkus.http.ssl.client-auth=request