svn commit: r1839744 - in /jackrabbit/oak/trunk/oak-segment-tar/src: main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java

[amitj]

Author: amitj
Date: Fri Aug 31 10:30:49 2018
New Revision: 1839744

URL: http://svn.apache.org/viewvc?rev=1839744&view=rev
Log:
OAK-7724: BlobGCMbean not registered with SegmentNodeStoreFactory

- Only ignoring registration of BlobGCMBean when configured with 'secondary' 
role

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java?rev=1839744&r1=1839743&r2=1839744&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java
 Fri Aug 31 10:30:49 2018
@@ -397,7 +397,7 @@ class SegmentNodeStoreRegistrar {
             }
         }
 
-        if (cfg.isPrimarySegmentStore() && cfg.getBlobStore() instanceof 
GarbageCollectableBlobStore) {
+        if (!cfg.isSecondarySegmentStore() && cfg.getBlobStore() instanceof 
GarbageCollectableBlobStore) {
             BlobGarbageCollector gc = new MarkSweepGarbageCollector(
                 new SegmentBlobReferenceRetriever(store),
                 (GarbageCollectableBlobStore) cfg.getBlobStore(),

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java?rev=1839744&r1=1839743&r2=1839744&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java
 Fri Aug 31 10:30:49 2018
@@ -28,7 +28,9 @@ import static org.mockito.Mockito.mock;
 import java.io.File;
 import java.util.Map;
 
+import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
@@ -100,6 +102,7 @@ public class SegmentNodeStoreServiceTest
 
         registerSegmentNodeStoreService(true);
         assertServiceActivated();
+        assertNotNull(context.getService(BlobGCMBean.class));
 
         unregisterSegmentNodeStoreService();
         unregisterBlobStore();
@@ -158,7 +161,7 @@ public class SegmentNodeStoreServiceTest
     private ServiceRegistration blobStore;
 
     private void registerBlobStore() {
-        blobStore = 
context.bundleContext().registerService(BlobStore.class.getName(), 
mock(BlobStore.class), null);
+        blobStore = 
context.bundleContext().registerService(BlobStore.class.getName(), 
mock(GarbageCollectableBlobStore.class), null);
     }
 
     private void unregisterBlobStore() {