diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 45db9347..2a232362 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -25,7 +25,7 @@ dhfs.objects.writeback.limit=1073741824 dhfs.objects.writeback.watermark-high=0.6 dhfs.objects.writeback.watermark-low=0.4 dhfs.objects.writeback.threads=4 -dhfs.objects.deletion.delay=0 +dhfs.objects.deletion.delay=1000 dhfs.objects.deletion.can-delete-retry-delay=1000 dhfs.objects.ref_verification=true dhfs.files.use_hash_for_chunks=false diff --git a/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java b/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java index ff021efc..2549a7a5 100644 --- a/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java +++ b/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java @@ -48,6 +48,7 @@ public class DhfsFuseIT { "-Ddhfs.objects.peerdiscovery.interval=500", "-Ddhfs.objects.invalidation.delay=200", "-Ddhfs.objects.ref_verification=true", + "-Ddhfs.objects.deletion.delay=0", "-Ddhfs.objects.sync.timeout=5", "-Dquarkus.log.category.\"com.usatiuk.dhfs\".level=TRACE", "-Dquarkus.log.category.\"com.usatiuk.dhfs\".min-level=TRACE", diff --git a/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java b/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java index 04768ddd..7edf16e6 100644 --- a/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java +++ b/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java @@ -51,11 +51,10 @@ public class DhfsFusex3IT { .cmd("java", "-ea", "-Xmx128M", "--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED", "-Ddhfs.objects.peerdiscovery.interval=500", "-Ddhfs.objects.invalidation.delay=200", - "-Djava.util.concurrent.ForkJoinPool.common.parallelism=4", + "-Ddhfs.objects.deletion.delay=0", "-Ddhfs.objects.ref_verification=true", "-Ddhfs.objects.sync.timeout=5", "-Dquarkus.log.category.\"com.usatiuk.dhfs\".level=TRACE", - "-Dquarkus.log.category.\"com.usatiuk.dhfs\".min-level=TRACE", "-jar", "/app/quarkus-run.jar") .build()) .withFileFromPath("/app", Paths.get(buildPath, "quarkus-app")); diff --git a/server/src/test/resources/application.properties b/server/src/test/resources/application.properties index 6a6fb964..f0fc72cc 100644 --- a/server/src/test/resources/application.properties +++ b/server/src/test/resources/application.properties @@ -2,5 +2,6 @@ dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root_test dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d_test dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root_test dhfs.objects.ref_verification=true +dhfs.objects.deletion.delay=0 quarkus.log.category."com.usatiuk.dhfs".level=TRACE quarkus.log.category."com.usatiuk.dhfs".min-level=TRACE