You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2018/09/19 08:52:16 UTC
svn commit: r1841302 - 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
Author: amitj
Date: Wed Sep 19 08:52:16 2018
New Revision: 1841302
URL: http://svn.apache.org/viewvc?rev=1841302&view=rev
Log:
OAK-7765: BlobGCMbean registered with SegmentNodeStoreFactory even if customBlobStore is false
- Fixed condition to also check if customBlobStore=true
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=1841302&r1=1841301&r2=1841302&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 Wed Sep 19 08:52:16 2018
@@ -412,7 +412,7 @@ class SegmentNodeStoreRegistrar {
}
}
- if (!cfg.isSecondarySegmentStore() && cfg.getBlobStore() instanceof GarbageCollectableBlobStore) {
+ if (!cfg.isSecondarySegmentStore() && cfg.hasCustomBlobStore() && (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=1841302&r1=1841301&r2=1841302&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 Wed Sep 19 08:52:16 2018
@@ -69,6 +69,7 @@ public class SegmentNodeStoreServiceTest
public void testNoCustomBlobStoreWithoutBlobStore() {
registerSegmentNodeStoreService(false);
assertServiceActivated();
+ assertBlobGCMbeanNotActivated();
unregisterSegmentNodeStoreService();
}
@@ -83,6 +84,7 @@ public class SegmentNodeStoreServiceTest
registerSegmentNodeStoreService(false);
assertServiceActivated();
+ assertBlobGCMbeanNotActivated();
unregisterSegmentNodeStoreService();
unregisterBlobStore();
@@ -96,6 +98,7 @@ public class SegmentNodeStoreServiceTest
public void testUseCustomBlobStoreWithoutBlobStore() {
registerSegmentNodeStoreService(true);
assertServiceNotActivated();
+ assertBlobGCMbeanNotActivated();
unregisterSegmentNodeStoreService();
}
@@ -110,7 +113,7 @@ public class SegmentNodeStoreServiceTest
registerSegmentNodeStoreService(true);
assertServiceActivated();
- assertNotNull(context.getService(BlobGCMBean.class));
+ assertBlobGCMbeanActivated();
unregisterSegmentNodeStoreService();
unregisterBlobStore();
@@ -128,6 +131,7 @@ public class SegmentNodeStoreServiceTest
registerBlobStore();
assertServiceActivated();
+ assertBlobGCMbeanActivated();
unregisterSegmentNodeStoreService();
unregisterBlobStore();
@@ -144,6 +148,7 @@ public class SegmentNodeStoreServiceTest
registerSegmentNodeStoreService(true);
assertServiceActivated();
+ assertBlobGCMbeanActivated();
unregisterBlobStore();
assertServiceNotActivated();
@@ -162,7 +167,7 @@ public class SegmentNodeStoreServiceTest
registerSegmentNodeStoreService(true);
assertServiceActivated();
- assertNotNull(context.getService(BlobGCMBean.class));
+ assertBlobGCMbeanActivated();
assertSharedDataStoreRegistered(dataStoreBlobStore);
unregisterSegmentNodeStoreService();
@@ -180,7 +185,7 @@ public class SegmentNodeStoreServiceTest
registerSegmentNodeStoreService(false);
assertServiceActivated();
- assertNull(context.getService(BlobGCMBean.class));
+ assertBlobGCMbeanNotActivated();
assertSharedDataStoreNotRegistered(dataStoreBlobStore);
unregisterSegmentNodeStoreService();
@@ -242,4 +247,13 @@ public class SegmentNodeStoreServiceTest
dataStoreBlobStore.getAllMetadataRecords(SharedDataStoreUtils.SharedStoreRecordType.REPOSITORY.getType());
assertTrue(allMetadataRecords.isEmpty());
}
+
+
+ protected void assertBlobGCMbeanActivated() {
+ assertNotNull(context.getService(BlobGCMBean.class));
+ }
+
+ protected void assertBlobGCMbeanNotActivated() {
+ assertNull(context.getService(BlobGCMBean.class));
+ }
}