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

cleanup sync handling a little

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-07-01 18:55:16 +02:00
parent fad1477ecf
commit 4e747228a9
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/SyncHandler.java
View File

@@ -1,6 +1,5 @@
package com.usatiuk.dhfs.storage.objects.repository.distributed;
import com.google.common.collect.Maps;
import com.usatiuk.dhfs.objects.repository.distributed.*;
import com.usatiuk.dhfs.storage.objects.jrepository.JObject;
import com.usatiuk.dhfs.storage.objects.jrepository.JObjectManager;
@@ -97,25 +96,13 @@ public class SyncHandler {
return true;
}
if (md.getOurVersion() > receivedTotalVer) {
if (hasLower) {
Log.info("Received older index update than known: "
+ from + " " + header.getName());
throw new OutdatedUpdateException();
}
if (Objects.equals(md.getOurVersion(), receivedTotalVer)) {
for (var e : header.getChangelog().getEntriesList()) {
if (!Objects.equals(
Maps.filterValues(md.getChangelog(), v -> v != 0),
Maps.filterValues(receivedMap, v -> v != 0))) {
Log.info("Conflict on update (other mismatch): " + header.getName() + " from " + from);
return true;
}
}
}
// md.getBestVersion() > md.getTotalVersion() should also work
if (receivedTotalVer > md.getOurVersion()) {
if (hasHigher) {
invalidate.apply();
md.getChangelog().clear();
md.getChangelog().putAll(receivedMap);
@@ -123,11 +110,9 @@ public class SyncHandler {
return false;
}
if (hasLower) {
Log.warn("Unhandled update with lower version: " + header.getName() + " from " + from);
throw new OutdatedUpdateException();
}
Log.warn("No action on update: " + header.getName() + " from " + from);
assert Objects.equals(receivedTotalVer, md.getOurVersion());
Log.info("No action on update: " + header.getName() + " from " + from);
return false;
});

2
server/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java
View File

@@ -40,7 +40,7 @@ public class DhfsFuseIT {
.from("azul/zulu-openjdk-debian:21-jre-latest")
.run("apt update && apt install -y libfuse2 curl")
.copy("/app", "/app")
.cmd("java", "-Xmx128M", "--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED",
.cmd("java", "-ea", "-Xmx128M", "--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED",
"-Ddhfs.objects.distributed.peerdiscovery.interval=500",
"-Ddhfs.objects.distributed.invalidation.delay=200",
"-Ddhfs.objects.ref_verification=true",

2
server/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java
View File

@@ -44,7 +44,7 @@ public class DhfsFusex3IT {
.from("azul/zulu-openjdk-debian:21-jre-latest")
.run("apt update && apt install -y libfuse2 curl")
.copy("/app", "/app")
.cmd("java", "-Xmx128M", "--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED",
.cmd("java", "-ea", "-Xmx128M", "--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED",
"-Ddhfs.objects.distributed.peerdiscovery.interval=500",
"-Ddhfs.objects.distributed.invalidation.delay=200",
"-Djava.util.concurrent.ForkJoinPool.common.parallelism=4",