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

Server: fix useless markInitialOpSync changes

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-10-13 10:55:32 +02:00
parent 2060ae8151
commit 4ef2fd5775
1 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/PersistentPeerDataService.java
View File

@@ -307,10 +307,24 @@ public class PersistentPeerDataService {
public boolean markInitialOpSyncDone(UUID connectedHost) {
return jObjectTxManager.executeTx(() -> {
peerDirectoryLocal.get().rwLock();
peerDirectoryLocal.get().tryResolve(JObjectManager.ResolutionStrategy.LOCAL_ONLY);
try {
peerDirectoryLocal.get().bumpVer();
return peerDirectoryLocal.get().getData().getInitialOpSyncDone().add(connectedHost);
peerDirectoryLocal.get().local();
boolean contained = peerDirectoryLocal.get().getData().getInitialOpSyncDone().contains(connectedHost);
if (!contained)
peerDirectoryLocal.get().local().mutate(new JMutator<PeerDirectoryLocal>() {
@Override
public boolean mutate(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialOpSyncDone().add(connectedHost);
return true;
}
@Override
public void revert(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialOpSyncDone().remove(connectedHost);
}
});
return !contained;
} finally {
peerDirectoryLocal.get().rwUnlock();
}
@@ -320,10 +334,24 @@ public class PersistentPeerDataService {
public boolean markInitialObjSyncDone(UUID connectedHost) {
return jObjectTxManager.executeTx(() -> {
peerDirectoryLocal.get().rwLock();
peerDirectoryLocal.get().tryResolve(JObjectManager.ResolutionStrategy.LOCAL_ONLY);
try {
peerDirectoryLocal.get().bumpVer();
return peerDirectoryLocal.get().getData().getInitialObjSyncDone().add(connectedHost);
peerDirectoryLocal.get().local();
boolean contained = peerDirectoryLocal.get().getData().getInitialObjSyncDone().contains(connectedHost);
if (!contained)
peerDirectoryLocal.get().local().mutate(new JMutator<PeerDirectoryLocal>() {
@Override
public boolean mutate(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialObjSyncDone().add(connectedHost);
return true;
}
@Override
public void revert(PeerDirectoryLocal object) {
peerDirectoryLocal.get().getData().getInitialObjSyncDone().remove(connectedHost);
}
});
return !contained;
} finally {
peerDirectoryLocal.get().rwUnlock();
}