Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java (revision 9f1e8bdc6c91ba750ac1eea540fe59ac89ef9114) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java (date 1535703785000) @@ -397,7 +397,7 @@ } } - if (cfg.isPrimarySegmentStore() && cfg.getBlobStore() instanceof GarbageCollectableBlobStore) { + if (!cfg.isSecondarySegmentStore() && cfg.getBlobStore() instanceof GarbageCollectableBlobStore) { BlobGarbageCollector gc = new MarkSweepGarbageCollector( new SegmentBlobReferenceRetriever(store), (GarbageCollectableBlobStore) cfg.getBlobStore(), Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java (revision 9f1e8bdc6c91ba750ac1eea540fe59ac89ef9114) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java (date 1535704951000) @@ -28,7 +28,9 @@ 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 @@ registerSegmentNodeStoreService(true); assertServiceActivated(); + assertNotNull(context.getService(BlobGCMBean.class)); unregisterSegmentNodeStoreService(); unregisterBlobStore(); @@ -158,7 +161,7 @@ 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() {