diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncProcessor.java index 365d4f5e..c799c7ee 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/AutosyncProcessor.java @@ -46,30 +46,28 @@ public class AutosyncProcessor { } executorService.submit(() -> { + Log.info("Adding all to autosync"); + ArrayList objs = new ArrayList<>(); txm.run(() -> { - Log.info("Adding all to autosync"); - ArrayList objs = new ArrayList<>(); - txm.run(() -> { - try (var it = curTx.getIterator(IteratorStart.GE, JObjectKey.first())) { - while (it.hasNext()) { - var key = it.peekNextKey(); - objs.add(key); - // TODO: Nested transactions - it.skip(); - } + try (var it = curTx.getIterator(IteratorStart.GE, JObjectKey.first())) { + while (it.hasNext()) { + var key = it.peekNextKey(); + objs.add(key); + // TODO: Nested transactions + it.skip(); } - }); - - for (var obj : objs) { - txm.run(() -> { - var gotObj = curTx.get(JData.class, obj).orElse(null); - if (!(gotObj instanceof RemoteObjectMeta meta)) - return; - if (!meta.hasLocalData()) - add(meta.key()); - }); } }); + + for (var obj : objs) { + txm.run(() -> { + var gotObj = curTx.get(JData.class, obj).orElse(null); + if (!(gotObj instanceof RemoteObjectMeta meta)) + return; + if (!meta.hasLocalData()) + add(meta.key()); + }); + } Log.info("Adding all to autosync: finished"); }); } diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java index ad907fdf..320c05be 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/SyncHandler.java @@ -129,7 +129,7 @@ public class SyncHandler { if (proc != null) { proc.prepareForInitialSync(peer, obj); } - Log.tracev("Adding to initial sync for peer {0}: {1}", peer, obj); + Log.infov("Adding to initial sync for peer {0}: {1}", peer, obj); invalidationQueueService.pushInvalidationToOne(peer, obj); }); }