(jackrabbit-oak) branch trunk updated: OAK-10559 : closing secondary to avoid test interference (#1232)

[stefanegli]

This is an automated email from the ASF dual-hosted git repository.

stefanegli pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 41adb88c85 OAK-10559 : closing secondary to avoid test interference 
(#1232)
41adb88c85 is described below

commit 41adb88c8513754c14d4787d45a87aea95763647
Author: stefan-egli <stefane...@apache.org>
AuthorDate: Thu Nov 23 11:29:43 2023 +0100

    OAK-10559 : closing secondary to avoid test interference (#1232)
---
 .../oak/plugins/document/VersionGarbageCollectorIT.java      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
index f46d4cdd32..3935c5d85a 100644
--- 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
+++ 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
@@ -97,6 +97,8 @@ public class VersionGarbageCollectorIT {
 
     private DocumentNodeStore store;
 
+    private DocumentNodeStore secondary;
+
     private VersionGarbageCollector gc;
 
     private ExecutorService execService;
@@ -141,6 +143,13 @@ public class VersionGarbageCollectorIT {
         if (store != null) {
             store.dispose();
         }
+        if (secondary != null) {
+            try {
+                secondary.dispose();
+            } catch(Exception e) {
+                // ignore
+            }
+        }
         Revision.resetClockToDefault();
         execService.shutdown();
         execService.awaitTermination(1, MINUTES);
@@ -430,10 +439,11 @@ public class VersionGarbageCollectorIT {
     }
 
     private DocumentNodeStore createSecondary() {
-        return new DocumentMK.Builder().clock(clock)
+        secondary = new DocumentMK.Builder().clock(clock)
                 .setLeaseCheckMode(LeaseCheckMode.DISABLED)
                 .setDocumentStore(store.getDocumentStore()).setAsyncDelay(0)
                 .setClusterId(2).getNodeStore();
+        return secondary;
     }
 
     private void createLeaf(DocumentNodeStore s, String... pathElems) throws 
Exception {