OAK-11461 : DocumentNodeStoreService - disable discovery (#2057)

* OAK-11461 - Make it configurable to disable discovery for the document node store service

* Update oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java

Co-authored-by: Rishabh Kumar <rishabhdaim1991@gmail.com>

* OAK-11461 - Add unit test

* Update oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java

Co-authored-by: José Andrés Cordero Benítez <Joscorbe@users.noreply.github.com>

---------

Co-authored-by: Niek Raaijmakers <raaijmak@adobe.com>
Co-authored-by: Rishabh Kumar <rishabhdaim1991@gmail.com>
Co-authored-by: José Andrés Cordero Benítez <Joscorbe@users.noreply.github.com>

Author: 4 people

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Configuration.java

@@ -395,4 +395,9 @@
             description = "Integer value indicating the number of documents to check for garbage in each Full GC cycle." +
                     "The default value is " + DocumentNodeStoreService.DEFAULT_FGC_PROGRESS_SIZE)
     int fullGCProgressSize() default DocumentNodeStoreService.DEFAULT_FGC_PROGRESS_SIZE;
+
+    @AttributeDefinition(
+            name = "Invisible for discovery",
+            description = "Boolean value indicating whether the instance should be discoverable by the cluster. The default value is " + DocumentNodeStoreService.DEFAULT_INVISIBLE_FOR_DISCOVERY)
+    boolean invisibleForDiscovery() default DocumentNodeStoreService.DEFAULT_INVISIBLE_FOR_DISCOVERY;
 }

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java

@@ -130,6 +130,7 @@
         configurationPid = {Configuration.PID})
 public class DocumentNodeStoreService {
 
+    public static final boolean DEFAULT_INVISIBLE_FOR_DISCOVERY = false;
     private static final long MB = 1024 * 1024;
     static final String DEFAULT_URI = "mongodb://localhost:27017/oak";
     static final int DEFAULT_CACHE = (int) (DEFAULT_MEMORY_CACHE_SIZE / MB);
@@ -510,6 +511,7 @@ private void configureBuilder(DocumentNodeStoreBuilder<?> builder) {
                         config.childrenCachePercentage(),
                         config.diffCachePercentage(),
                         config.prevNoPropCachePercentage()).
+                setClusterInvisible(config.invisibleForDiscovery()).
                 setCacheSegmentCount(config.cacheSegmentCount()).
                 setCacheStackMoveDistance(config.cacheStackMoveDistance()).
                 setBundlingDisabled(config.bundlingDisabled()).

oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceConfigurationTest.java

@@ -45,6 +45,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 public class DocumentNodeStoreServiceConfigurationTest {
 
@@ -169,6 +170,28 @@ public void fullGCBatchSize() throws Exception {
         assertEquals(batchSize, config.fullGCBatchSize());
     }
 
+    @Test
+    public void invisibleForDiscoveryFalse() throws Exception {
+        boolean batchSize = false;
+        addConfigurationEntry(preset, "invisibleForDiscovery", batchSize);
+        Configuration config = createConfiguration();
+        assertFalse(config.invisibleForDiscovery());
+    }
+
+    @Test
+    public void invisibleForDiscoveryTrue() throws Exception {
+        boolean batchSize = true;
+        addConfigurationEntry(preset, "invisibleForDiscovery", batchSize);
+        Configuration config = createConfiguration();
+        assertTrue(config.invisibleForDiscovery());
+    }
+
+    @Test
+    public void invisibleForDiscoveryFalseByDefault() throws Exception {
+        Configuration config = createConfiguration();
+        assertFalse(config.invisibleForDiscovery());
+    }
+
     @Test
     public void fullGCProgressSize() throws Exception {
         int progressSize = 20000;

oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java

@@ -256,6 +256,29 @@ public void strictLeaseCheckMode() {
         assertEquals(LeaseCheckMode.STRICT, dns.getClusterInfo().getLeaseCheckMode());
     }
 
+    @Test
+    public void invisibleForDiscoveryTrueFalse() {
+        Map<String, Object> config = newConfig(repoHome);
+        MockOsgi.setConfigForPid(context.bundleContext(), PID, config);
+        MockOsgi.activate(service, context.bundleContext());
+
+        DocumentNodeStore dns = context.getService(DocumentNodeStore.class);
+        // false is the default
+        assertFalse(dns.getClusterInfo().isInvisible());
+    }
+
+    @Test
+    public void invisibleForDiscoveryTrue() {
+        Map<String, Object> config = newConfig(repoHome);
+        config.put("invisibleForDiscovery", true);
+        MockOsgi.setConfigForPid(context.bundleContext(), PID, config);
+        MockOsgi.activate(service, context.bundleContext());
+
+        DocumentNodeStore dns = context.getService(DocumentNodeStore.class);
+        assertTrue(dns.getClusterInfo().isInvisible());
+    }
+
+
     @Test
     public void lenientLeaseCheckMode() {
         Map<String, Object> config = newConfig(repoHome);