Repository writes in SegmentStoreMigrator blocked when migrating to A…

…zure segment store (#1308) * OAK-10652 obrain lock in target SegmentNodeStorePersistence * OAK-10652 remove unused import --------- Co-authored-by: Miroslav Smiljanic <[email protected]>
apache · Feb 16, 2024 · d2fdd67 · d2fdd67
1 parent 32462bd
commit d2fdd67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...zure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentStoreMigrator.java b/...zure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentStoreMigrator.java
@@ -33,6 +33,7 @@
 import org.apache.jackrabbit.oak.segment.spi.persistence.GCJournalFile;
 import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileReader;
 import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileWriter;
+import org.apache.jackrabbit.oak.segment.spi.persistence.RepositoryLock;
 import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry;
 import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager;
 import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader;
@@ -88,10 +89,14 @@ private SegmentStoreMigrator(Builder builder) {
     }
 
     public void migrate() throws IOException, ExecutionException, InterruptedException {
+        RepositoryLock repositoryLock = target.lockRepository();
+
         RETRIER.execute(this::migrateJournal);
         RETRIER.execute(this::migrateGCJournal);
         RETRIER.execute(this::migrateManifest);
         migrateArchives();
+
+        repositoryLock.unlock();
     }
 
     private void migrateJournal() throws IOException {

diff --git a/...azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyTestBase.java b/...azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyTestBase.java
@@ -67,7 +67,6 @@
 import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager;
 import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader;
 import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
-import org.apache.jackrabbit.oak.segment.spi.persistence.RepositoryLock;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -102,8 +101,6 @@ public void testSegmentCopy() throws Exception {
         SegmentNodeStorePersistence srcPersistence = getSrcPersistence();
         SegmentNodeStorePersistence destPersistence = getDestPersistence();
 
-        RepositoryLock destRepositoryLock = destPersistence.lockRepository();
-
         String srcPathOrUri = getSrcPathOrUri();
         String destPathOrUri = getDestPathOrUri();
 
@@ -123,8 +120,6 @@ public void testSegmentCopy() throws Exception {
         checkJournal(srcPersistence, destPersistence);
         checkGCJournal(srcPersistence, destPersistence);
         checkManifest(srcPersistence, destPersistence);
-
-        destRepositoryLock.unlock();
     }
 
     private int runSegmentCopy(SegmentNodeStorePersistence srcPersistence, SegmentNodeStorePersistence destPersistence,