Author: frm
Date: Fri Jul 14 08:24:49 2017
New Revision: 1801914
URL: http://svn.apache.org/viewvc?rev=1801914&view=rev
Log:
OAK-4883 - Register the BlobGarbageCollection MBean on standby instance
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBuilder.java
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 14 08:24:49 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774
497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799924,1800974
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773
190,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799924,1800974
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1801914&r1=1801913&r2=1801914&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Fri Jul 14 08:24:49 2017
@@ -43,6 +43,7 @@ import java.util.concurrent.atomic.Atomi
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -123,13 +124,21 @@ public class SegmentNodeStore implements
}
SegmentNodeStore(SegmentStore store, boolean internal) {
+ this(store, internal, true);
+ }
+
+ SegmentNodeStore(SegmentStore store, boolean internal, boolean
dispatchChanges) {
if (commitFairLock) {
log.info("initializing SegmentNodeStore with the commitFairLock
option enabled.");
}
this.commitSemaphore = new Semaphore(1, commitFairLock);
this.store = store;
this.head = new AtomicReference<SegmentNodeState>(store.getHead());
- this.changeDispatcher = new ChangeDispatcher(getRoot());
+ if (dispatchChanges) {
+ this.changeDispatcher = new ChangeDispatcher(getRoot());
+ } else {
+ this.changeDispatcher = null;
+ }
}
public SegmentNodeStore() throws IOException {
@@ -189,12 +198,24 @@ public class SegmentNodeStore implements
SegmentNodeState state = store.getHead();
if (!state.getRecordId().equals(head.get().getRecordId())) {
head.set(state);
- changeDispatcher.contentChanged(state.getChildNode(ROOT), null);
+ contentChanged(state.getChildNode(ROOT), null);
}
}
+ private static final Closeable NOOP = new Closeable() {
+
+ @Override
+ public void close() throws IOException {
+ // Do nothing.
+ }
+
+ };
+
@Override
public Closeable addObserver(Observer observer) {
+ if (changeDispatcher == null) {
+ return NOOP;
+ }
return changeDispatcher.addObserver(observer);
}
@@ -479,7 +500,7 @@ public class SegmentNodeStore implements
refreshHead();
if (store.setHead(before, after)) {
head.set(after);
- changeDispatcher.contentChanged(after.getChildNode(ROOT),
info);
+ contentChanged(after.getChildNode(ROOT), info);
refreshHead();
return true;
} else {
@@ -595,4 +616,11 @@ public class SegmentNodeStore implements
void setCheckpointsLockWaitTime(int checkpointsLockWaitTime) {
this.checkpointsLockWaitTime = checkpointsLockWaitTime;
}
+
+ void contentChanged(NodeState root, CommitInfo info) {
+ if (changeDispatcher != null) {
+ changeDispatcher.contentChanged(root, info);
+ }
+ }
+
}
Modified:
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBuilder.java?rev=1801914&r1=1801913&r2=1801914&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBuilder.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreBuilder.java
Fri Jul 14 08:24:49 2017
@@ -34,6 +34,8 @@ public class SegmentNodeStoreBuilder {
private boolean isCreated;
+ private boolean dispatchChanges = true;
+
private CompactionStrategy compactionStrategy = NO_COMPACTION;
private volatile SegmentNodeStore segmentNodeStore;
@@ -97,6 +99,11 @@ public class SegmentNodeStoreBuilder {
return this;
}
+ public SegmentNodeStoreBuilder withDispatchChanges(boolean
dispatchChanges) {
+ this.dispatchChanges = dispatchChanges;
+ return this;
+ }
+
public CompactionStrategy getCompactionStrategy() {
checkState(isCreated);
return compactionStrategy;
@@ -106,7 +113,7 @@ public class SegmentNodeStoreBuilder {
public SegmentNodeStore create() {
checkState(!isCreated);
isCreated = true;
- segmentNodeStore = new SegmentNodeStore(store, true);
+ segmentNodeStore = new SegmentNodeStore(store, true, dispatchChanges);
return segmentNodeStore;
}
Modified:
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java?rev=1801914&r1=1801913&r2=1801914&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Fri Jul 14 08:24:49 2017
@@ -342,18 +342,16 @@ public class SegmentNodeStoreService ext
}
private synchronized void registerNodeStore() throws IOException {
- if (registerSegmentStore()) {
- if (toBoolean(property(STANDBY), false)) {
- return;
- }
-
- if (registerSegmentNodeStore()) {
- Dictionary<String, Object> props = new Hashtable<String,
Object>();
- props.put(Constants.SERVICE_PID,
SegmentNodeStore.class.getName());
- props.put("oak.nodestore.description", new
String[]{"nodeStoreType=segment"});
- storeRegistration =
context.getBundleContext().registerService(NodeStore.class.getName(), this,
props);
- }
+ if (!registerSegmentStore()) {
+ return;
}
+ if (toBoolean(property(STANDBY), false)) {
+ return;
+ }
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
+ props.put(Constants.SERVICE_PID, SegmentNodeStore.class.getName());
+ props.put("oak.nodestore.description", new String[]
{"nodeStoreType=segment"});
+ storeRegistration =
context.getBundleContext().registerService(NodeStore.class.getName(), this,
props);
}
private boolean registerSegmentStore() throws IOException {
@@ -478,60 +476,16 @@ public class SegmentNodeStoreService ext
scheduleWithFixedDelay(whiteboard, fsgcm, 1)
);
- // Register a factory service to expose the FileStore
-
- providerRegistration =
context.getBundleContext().registerService(SegmentStoreProvider.class.getName(),
this, null);
-
- return true;
- }
-
- private CompactionStrategy newCompactionStrategy() {
- boolean pauseCompaction = toBoolean(property(PAUSE_COMPACTION),
PAUSE_DEFAULT);
- boolean cloneBinaries = toBoolean(property(COMPACTION_CLONE_BINARIES),
CLONE_BINARIES_DEFAULT);
- long cleanupTs = toLong(property(COMPACTION_CLEANUP_TIMESTAMP),
TIMESTAMP_DEFAULT);
- int retryCount = toInteger(property(COMPACTION_RETRY_COUNT),
RETRY_COUNT_DEFAULT);
- boolean forceAfterFail =
toBoolean(property(COMPACTION_FORCE_AFTER_FAIL), FORCE_AFTER_FAIL_DEFAULT);
- final int lockWaitTime =
toInteger(property(COMPACTION_LOCK_WAIT_TIME),
COMPACTION_LOCK_WAIT_TIME_DEFAULT);
- boolean persistCompactionMap =
toBoolean(property(PERSIST_COMPACTION_MAP), PERSIST_COMPACTION_MAP_DEFAULT);
-
- CleanupType cleanupType = getCleanUpType();
- byte memoryThreshold = getMemoryThreshold();
- byte gainThreshold = getGainThreshold();
-
- // This is indeed a dirty hack, but it's needed to break a circular
- // dependency between different components. The FileStore needs the
- // CompactionStrategy, the CompactionStrategy needs the
- // SegmentNodeStore, and the SegmentNodeStore needs the FileStore.
-
- CompactionStrategy compactionStrategy = new
CompactionStrategy(pauseCompaction, cloneBinaries, cleanupType, cleanupTs,
memoryThreshold) {
-
- @Override
- public boolean compacted(Callable<Boolean> setHead) throws
Exception {
- // Need to guard against concurrent commits to avoid
- // mixed segments. See OAK-2192.
- return segmentNodeStore.locked(setHead, lockWaitTime, SECONDS);
- }
-
- };
-
- compactionStrategy.setRetryCount(retryCount);
- compactionStrategy.setForceAfterFail(forceAfterFail);
- compactionStrategy.setPersistCompactionMap(persistCompactionMap);
- compactionStrategy.setGainThreshold(gainThreshold);
-
- return compactionStrategy;
- }
-
- private boolean registerSegmentNodeStore() throws IOException {
Dictionary<?, ?> properties = context.getProperties();
name = String.valueOf(properties.get(NAME));
final long blobGcMaxAgeInSecs = toLong(property(PROP_BLOB_GC_MAX_AGE),
DEFAULT_BLOB_GC_MAX_AGE);
- OsgiWhiteboard whiteboard = new
OsgiWhiteboard(context.getBundleContext());
-
SegmentNodeStoreBuilder nodeStoreBuilder =
SegmentNodeStore.newSegmentNodeStore(store);
nodeStoreBuilder.withCompactionStrategy(compactionStrategy);
+ if (toBoolean(property(STANDBY), false)) {
+ nodeStoreBuilder.withDispatchChanges(false);
+ }
segmentNodeStore = nodeStoreBuilder.create();
observerTracker = new ObserverTracker(segmentNodeStore);
@@ -579,9 +533,51 @@ public class SegmentNodeStoreService ext
}
log.info("SegmentNodeStore initialized");
+
+ // Register a factory service to expose the FileStore
+
+ providerRegistration =
context.getBundleContext().registerService(SegmentStoreProvider.class.getName(),
this, null);
+
return true;
}
+ private CompactionStrategy newCompactionStrategy() {
+ boolean pauseCompaction = toBoolean(property(PAUSE_COMPACTION),
PAUSE_DEFAULT);
+ boolean cloneBinaries = toBoolean(property(COMPACTION_CLONE_BINARIES),
CLONE_BINARIES_DEFAULT);
+ long cleanupTs = toLong(property(COMPACTION_CLEANUP_TIMESTAMP),
TIMESTAMP_DEFAULT);
+ int retryCount = toInteger(property(COMPACTION_RETRY_COUNT),
RETRY_COUNT_DEFAULT);
+ boolean forceAfterFail =
toBoolean(property(COMPACTION_FORCE_AFTER_FAIL), FORCE_AFTER_FAIL_DEFAULT);
+ final int lockWaitTime =
toInteger(property(COMPACTION_LOCK_WAIT_TIME),
COMPACTION_LOCK_WAIT_TIME_DEFAULT);
+ boolean persistCompactionMap =
toBoolean(property(PERSIST_COMPACTION_MAP), PERSIST_COMPACTION_MAP_DEFAULT);
+
+ CleanupType cleanupType = getCleanUpType();
+ byte memoryThreshold = getMemoryThreshold();
+ byte gainThreshold = getGainThreshold();
+
+ // This is indeed a dirty hack, but it's needed to break a circular
+ // dependency between different components. The FileStore needs the
+ // CompactionStrategy, the CompactionStrategy needs the
+ // SegmentNodeStore, and the SegmentNodeStore needs the FileStore.
+
+ CompactionStrategy compactionStrategy = new
CompactionStrategy(pauseCompaction, cloneBinaries, cleanupType, cleanupTs,
memoryThreshold) {
+
+ @Override
+ public boolean compacted(Callable<Boolean> setHead) throws
Exception {
+ // Need to guard against concurrent commits to avoid
+ // mixed segments. See OAK-2192.
+ return segmentNodeStore.locked(setHead, lockWaitTime, SECONDS);
+ }
+
+ };
+
+ compactionStrategy.setRetryCount(retryCount);
+ compactionStrategy.setForceAfterFail(forceAfterFail);
+ compactionStrategy.setPersistCompactionMap(persistCompactionMap);
+ compactionStrategy.setGainThreshold(gainThreshold);
+
+ return compactionStrategy;
+ }
+
private void unregisterNodeStore() {
if (segmentCacheMBean != null) {
segmentCacheMBean.unregister();
