From 66d2c26551f5160fea8b9ae2590a8d9783216f6e Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Sun, 14 Jul 2024 09:37:25 +0200 Subject: [PATCH] less network spam --- docker-compose.example.yml | 12 ++++++------ server/src/main/resources/application.properties | 4 ++-- .../com/usatiuk/dhfs/integration/DhfsFuseIT.java | 2 +- .../com/usatiuk/dhfs/integration/DhfsFusex3IT.java | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 231fee1b..3ce57c2b 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -2,23 +2,23 @@ version: "3.2" services: dhfs1: - image: ghcr.io/usatiuk/dhfs:main - # build: . + # image: ghcr.io/usatiuk/dhfs:main + build: . privileged: true devices: - /dev/fuse - command: "./dockerentry.sh -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010" + command: "./dockerentry.sh -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010 -Ddhfs.objects.autosync.download-all=true" ports: - 8080:8080 - 8081:8443 - 5005:5005 dhfs2: - image: ghcr.io/usatiuk/dhfs:main - # build: . + # image: ghcr.io/usatiuk/dhfs:main + build: . privileged: true devices: - /dev/fuse - command: "./dockerentry.sh -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010" + command: "./dockerentry.sh -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010 -Ddhfs.objects.autosync.download-all=true" ports: - 8090:8080 - 8091:8443 diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 2a232362..51df351b 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -2,13 +2,13 @@ quarkus.grpc.server.use-separate-server=false dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d dhfs.objects.peerdiscovery.port=42069 -dhfs.objects.peerdiscovery.interval=1000 +dhfs.objects.peerdiscovery.interval=5000 dhfs.objects.peersync.timeout=5 dhfs.objects.sync.timeout=30 dhfs.objects.sync.ping.timeout=5 dhfs.objects.invalidation.threads=4 dhfs.objects.invalidation.delay=1000 -dhfs.objects.reconnect_interval=1s +dhfs.objects.reconnect_interval=5s dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root dhfs.fuse.debug=false dhfs.fuse.enabled=true 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 2549a7a5..2730a1f3 100644 --- a/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java +++ b/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java @@ -50,8 +50,8 @@ public class DhfsFuseIT { "-Ddhfs.objects.ref_verification=true", "-Ddhfs.objects.deletion.delay=0", "-Ddhfs.objects.sync.timeout=5", + "-Ddhfs.objects.reconnect_interval=1s", "-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/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java b/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java index 7edf16e6..a77b1d3e 100644 --- a/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java +++ b/server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java @@ -54,6 +54,7 @@ public class DhfsFusex3IT { "-Ddhfs.objects.deletion.delay=0", "-Ddhfs.objects.ref_verification=true", "-Ddhfs.objects.sync.timeout=5", + "-Ddhfs.objects.reconnect_interval=1s", "-Dquarkus.log.category.\"com.usatiuk.dhfs\".level=TRACE", "-jar", "/app/quarkus-run.jar") .build())