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

rewrite changelog only if update updates

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-30 20:30:33 +02:00
parent 65d7a0a288
commit 82bd5a577a
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,11 +115,13 @@ public class SyncHandler {
// md.getBestVersion() > md.getTotalVersion() should also work
if (receivedTotalVer > md.getOurVersion()) {
invalidate.apply();
md.getChangelog().clear();
md.getChangelog().putAll(receivedMap);
md.getChangelog().putIfAbsent(persistentRemoteHostsService.getSelfUuid(), 0L);
return false;
}
md.getChangelog().clear();
md.getChangelog().putAll(receivedMap);
md.getChangelog().putIfAbsent(persistentRemoteHostsService.getSelfUuid(), 0L);
Log.warn("No action on update: " + header.getName() + " from " + from);
return false;
});

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

@@ -44,7 +44,7 @@ public class DhfsFuseIT {
"-Ddhfs.objects.distributed.peerdiscovery.interval=100",
"-Ddhfs.objects.distributed.invalidation.delay=100",
"-Ddhfs.objects.ref_verification=true",
"-Dquarkus.log.category.\"com.usatiuk.dhfs\".level=TRACE",
"-Dquarkus.log.category.\\\"com.usatiuk.dhfs\\\".level=TRACE",
"-jar", "/app/quarkus-run.jar")
.build())
.withFileFromPath("/app", Paths.get(buildPath, "quarkus-app"));

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

@@ -49,7 +49,7 @@ public class DhfsFusex3IT {
"-Ddhfs.objects.distributed.invalidation.delay=100",
"-Djava.util.concurrent.ForkJoinPool.common.parallelism=4",
"-Ddhfs.objects.ref_verification=true",
"-Dquarkus.log.category.\"com.usatiuk.dhfs\".level=TRACE",
"-Dquarkus.log.category.\\\"com.usatiuk.dhfs\\\".level=TRACE",
"-jar", "/app/quarkus-run.jar")
.build())
.withFileFromPath("/app", Paths.get(buildPath, "quarkus-app"));