From 8b4430fa73030f60098f078dca6dcf50337ab196 Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Wed, 14 May 2025 14:16:06 +0200 Subject: [PATCH] Some config cleanup --- README.md | 2 +- .../com/usatiuk/dhfsfs/service/DhfsFileService.java | 7 +------ .../src/main/resources/application.properties | 13 +++---------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index b7a031a2..b5cca726 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ In the run-wrapper, 3 scripts are available. - `stop` script stops it - `update` script will update the filesystem to the newest available CI build -On Windows, Powershell alternatives should be used. For them to work, it might be required to allow execution of unsigned scripts using `set-executionpolicy remotesigned`. +On Windows, Powershell alternatives should be used. For them to work, it might be required to allow execution of unsigned scripts using `set-executionpolicy unrestricted`. Additional options for the filesystem can be specified in the `extra-opts` file in the same directory with the run scripts. diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java index 26440407..2dae0c37 100644 --- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java +++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java @@ -51,14 +51,9 @@ public class DhfsFileService { int targetChunkSize; @ConfigProperty(name = "dhfs.files.max_chunk_size", defaultValue = "524288") int maxChunkSize; - @ConfigProperty(name = "dhfs.files.use_hash_for_chunks") - boolean useHashForChunks; @ConfigProperty(name = "dhfs.files.allow_recursive_delete") boolean allowRecursiveDelete; - @ConfigProperty(name = "dhfs.objects.ref_verification") - boolean refVerification; - @ConfigProperty(name = "dhfs.objects.write_log") - boolean writeLogging; + @Inject Transaction curTx; diff --git a/dhfs-parent/dhfs-fuse/src/main/resources/application.properties b/dhfs-parent/dhfs-fuse/src/main/resources/application.properties index 750df34e..9336d477 100644 --- a/dhfs-parent/dhfs-fuse/src/main/resources/application.properties +++ b/dhfs-parent/dhfs-fuse/src/main/resources/application.properties @@ -6,27 +6,20 @@ dhfs.objects.sync.timeout=30 dhfs.objects.sync.ping.timeout=5 dhfs.objects.invalidation.threads=16 dhfs.objects.invalidation.delay=1000 -dhfs.objects.reconnect_interval=5s -dhfs.objects.write_log=false -dhfs.objects.periodic-push-op-interval=5m dhfs.fuse.root=${HOME}/dhfs_default/fuse dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff dhfs.fuse.debug=false dhfs.fuse.enabled=true dhfs.files.allow_recursive_delete=false dhfs.files.target_chunk_size=524288 -dhfs.files.max_chunk_size=524288 dhfs.files.target_chunk_alignment=17 dhfs.objects.deletion.delay=1000 dhfs.objects.deletion.can-delete-retry-delay=10000 dhfs.objects.ref_verification=true -dhfs.files.use_hash_for_chunks=false -dhfs.objects.autosync.threads=16 +dhfs.objects.autosync.threads=8 dhfs.objects.autosync.download-all=false -dhfs.objects.move-processor.threads=16 -dhfs.objects.ref-processor.threads=16 -dhfs.objects.opsender.batch-size=100 -dhfs.objects.lock_timeout_secs=2 +dhfs.objects.move-processor.threads=8 +dhfs.objects.ref-processor.threads=8 dhfs.local-discovery=true dhfs.peerdiscovery.timeout=10000 quarkus.log.category."com.usatiuk".min-level=TRACE