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

conflict detection fix

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-30 19:37:12 +02:00
parent d376d4d781
commit 2f31753446
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,11 +81,18 @@ public class SyncHandler {
md.getRemoteCopies().put(from, receivedTotalVer);
boolean hasLower = false;
boolean hasHigher = false;
for (var e : md.getChangelog().entrySet()) {
if (receivedMap.getOrDefault(e.getKey(), 0L) < e.getValue()) {
Log.info("Conflict on update (lower version): " + header.getName() + " from " + from);
return true;
}
if (receivedMap.getOrDefault(e.getKey(), 0L) < e.getValue())
hasLower = true;
if (receivedMap.getOrDefault(e.getKey(), 0L) > e.getValue())
hasHigher = true;
}
if (hasLower && hasHigher) {
Log.info("Conflict on update (inconsistent version): " + header.getName() + " from " + from);
return true;
}
if (md.getOurVersion() > receivedTotalVer) {