svn commit: r1798582 - /jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java

[to...@apache.org]

Author: tomekr
Date: Tue Jun 13 12:02:06 2017
New Revision: 1798582

URL: http://svn.apache.org/viewvc?rev=1798582&view=rev
Log:
OAK-6340: Don't restart the composite node store on every node store bind/unbind

Modified:
    jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java

Modified: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java?rev=1798582&r1=1798581&r2=1798582&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java Tue Jun 13 12:02:06 2017
@@ -50,6 +50,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static com.google.common.collect.Sets.newIdentityHashSet;
 import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
 
 @Component(policy = ConfigurationPolicy.REQUIRE)
@@ -81,6 +82,8 @@ public class CompositeNodeStoreService {
 
     private ComponentContext context;
 
+    private Set<NodeStoreProvider> nodeStoresInUse = newIdentityHashSet();
+
     private ServiceRegistration nsReg;
 
     private Registration checkpointReg;
@@ -135,6 +138,8 @@ public class CompositeNodeStoreService {
         LOG.info("Node stores for all configured mounts are available");
 
         CompositeNodeStore.Builder builder = new CompositeNodeStore.Builder(mountInfoProvider, globalNs.getNodeStoreProvider().getNodeStore());
+        nodeStoresInUse.add(globalNs.getNodeStoreProvider());
+
         builder.setPartialReadOnly(partialReadOnly);
         for (String p : ignoreReadOnlyWritePaths) {
             builder.addIgnoredReadOnlyWritePath(p);
@@ -148,6 +153,7 @@ public class CompositeNodeStoreService {
             if (mountName != null) {
                 builder.addMount(mountName, ns.getNodeStoreProvider().getNodeStore());
                 LOG.info("Mounting {} as {}", getDescription(ns), mountName);
+                nodeStoresInUse.add(ns.getNodeStoreProvider());
             }
         }
 
@@ -209,6 +215,7 @@ public class CompositeNodeStoreService {
             observerTracker.stop();
             observerTracker = null;
         }
+        nodeStoresInUse.clear();
     }
 
     protected void bindNodeStore(NodeStoreProvider ns, Map<String, ?> config) {
@@ -220,8 +227,9 @@ public class CompositeNodeStoreService {
             return;
         }
 
-        unregisterCompositeNodeStore();
-        registerCompositeNodeStore();
+        if (nsReg == null) {
+            registerCompositeNodeStore();
+        }
     }
 
     protected void unbindNodeStore(NodeStoreProvider ns) {
@@ -237,8 +245,9 @@ public class CompositeNodeStoreService {
             return;
         }
 
-        unregisterCompositeNodeStore();
-        registerCompositeNodeStore();
+        if (nsReg != null && nodeStoresInUse.contains(ns)) {
+            unregisterCompositeNodeStore();
+        }
     }
 
     private static class NodeStoreWithProps {