stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-28 20:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Slight fixes

Browse Source
This commit is contained in:
Stepan Usatiuk
2025-05-14 19:21:00 +02:00
parent 2cd210dfd1
commit a5490047b8
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java
View File

@@ -45,10 +45,8 @@ import java.util.stream.StreamSupport;
*/ */
@ApplicationScoped @ApplicationScoped
public class DhfsFileService { public class DhfsFileService {
@ConfigProperty(name = "dhfs.files.target_chunk_alignment") @ConfigProperty(name = "dhfs.files.target_chunk_alignment", defaultValue = "17")
int targetChunkAlignment; int targetChunkAlignment;
@ConfigProperty(name = "dhfs.files.target_chunk_size")
int targetChunkSize;
@ConfigProperty(name = "dhfs.files.max_chunk_size", defaultValue = "524288") @ConfigProperty(name = "dhfs.files.max_chunk_size", defaultValue = "524288")
int maxChunkSize; int maxChunkSize;
@ConfigProperty(name = "dhfs.files.allow_recursive_delete") @ConfigProperty(name = "dhfs.files.allow_recursive_delete")
@@ -84,6 +82,10 @@ public class DhfsFileService {
return newChunk; return newChunk;
} }
int targetChunkSize() {
return 1 << targetChunkAlignment;
}
void init(@Observes @Priority(500) StartupEvent event) { void init(@Observes @Priority(500) StartupEvent event) {
Log.info("Initializing file service"); Log.info("Initializing file service");
getTree(); getTree();
@@ -494,7 +496,7 @@ public class DhfsFileService {
else if (targetChunkAlignment < 0) else if (targetChunkAlignment < 0)
end = combinedSize; end = combinedSize;
else else
end = Math.min(cur + targetChunkSize, combinedSize); end = Math.min(cur + targetChunkSize(), combinedSize);
var thisChunk = pendingWrites.substring(cur, end); var thisChunk = pendingWrites.substring(cur, end);
@@ -638,11 +640,11 @@ public class DhfsFileService {
while (cur < combinedSize) { while (cur < combinedSize) {
long end; long end;
if (targetChunkSize <= 0) if (targetChunkSize() <= 0)
end = combinedSize; end = combinedSize;
else { else {
if ((combinedSize - cur) > (targetChunkSize * 1.5)) { if ((combinedSize - cur) > (targetChunkSize() * 1.5)) {
end = cur + targetChunkSize; end = cur + targetChunkSize();
} else { } else {
end = combinedSize; end = combinedSize;
} }

2
dhfs-parent/dhfs-fs/src/main/resources/application.properties
View File

@@ -12,8 +12,6 @@ dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
dhfs.fuse.debug=false dhfs.fuse.debug=false
dhfs.fuse.enabled=true dhfs.fuse.enabled=true
dhfs.files.allow_recursive_delete=false dhfs.files.allow_recursive_delete=false
dhfs.files.target_chunk_size=2097152
dhfs.files.target_chunk_alignment=19
dhfs.objects.deletion.delay=1000 dhfs.objects.deletion.delay=1000
dhfs.objects.deletion.can-delete-retry-delay=10000 dhfs.objects.deletion.can-delete-retry-delay=10000
dhfs.objects.ref_verification=true dhfs.objects.ref_verification=true

2
dhfs-parent/dhfs-fuse/src/main/resources/application.properties
View File

@@ -9,8 +9,6 @@ dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
dhfs.fuse.debug=false dhfs.fuse.debug=false
dhfs.fuse.enabled=true dhfs.fuse.enabled=true
dhfs.files.allow_recursive_delete=false dhfs.files.allow_recursive_delete=false
dhfs.files.target_chunk_size=524288
dhfs.files.target_chunk_alignment=17
dhfs.objects.deletion.delay=1000 dhfs.objects.deletion.delay=1000
dhfs.objects.deletion.can-delete-retry-delay=10000 dhfs.objects.deletion.can-delete-retry-delay=10000
dhfs.objects.ref_verification=true dhfs.objects.ref_verification=true

2
dhfs-parent/sync-base/src/main/resources/application.properties
View File

@@ -12,8 +12,6 @@ dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
dhfs.fuse.debug=false dhfs.fuse.debug=false
dhfs.fuse.enabled=true dhfs.fuse.enabled=true
dhfs.files.allow_recursive_delete=false dhfs.files.allow_recursive_delete=false
dhfs.files.target_chunk_size=2097152
dhfs.files.target_chunk_alignment=19
dhfs.objects.deletion.delay=1000 dhfs.objects.deletion.delay=1000
dhfs.objects.deletion.can-delete-retry-delay=10000 dhfs.objects.deletion.can-delete-retry-delay=10000
dhfs.objects.ref_verification=true dhfs.objects.ref_verification=true