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 al...@apache.org on 2015/11/05 15:50:28 UTC
svn commit: r1712788 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
Author: alexparvulescu
Date: Thu Nov 5 14:50:27 2015
New Revision: 1712788
URL: http://svn.apache.org/viewvc?rev=1712788&view=rev
Log:
OAK-3587 SegmentNodeStore stricter checkpoint creation policy
- merged r1712730
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 5 14:50:27 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695507,1695521,1695540,1696190,1696194,1696242,1696285,1696
375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711296,1711498,1712042,1712490,1712531
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695507,1695521,1695540,1696190,1696194,1696242,1696285,1696
375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711296,1711498,1712042,1712490,1712531,1712730
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1712788&r1=1712787&r2=1712788&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java Thu Nov 5 14:50:27 2015
@@ -18,10 +18,13 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Maps.newHashMap;
import static java.lang.System.currentTimeMillis;
+import static java.lang.Thread.currentThread;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.plugins.segment.Record.fastEquals;
@@ -35,16 +38,15 @@ import java.util.Random;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import com.google.common.collect.Maps;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.commit.ChangeDispatcher;
@@ -92,6 +94,13 @@ public class SegmentNodeStore implements
private long maximumBackoff = MILLISECONDS.convert(10, SECONDS);
+ /**
+ * Sets the number of seconds to wait for the attempt to grab the lock to
+ * create a checkpoint
+ */
+ private int checkpointsLockWaitTime = Integer.getInteger(
+ "oak.checkpoints.lockWaitTime", 10);
+
public SegmentNodeStore(SegmentStore store) {
this.store = store;
this.head = new AtomicReference<SegmentNodeState>(store.getHead());
@@ -106,6 +115,13 @@ public class SegmentNodeStore implements
this.maximumBackoff = max;
}
+ /**
+ * Execute the passed callable with trying to acquire this store's commit lock.
+ * @param c callable to execute
+ * @return {@code false} if the store's commit lock cannot be acquired, the result
+ * of {@code c.call()} otherwise.
+ * @throws Exception
+ */
boolean locked(Callable<Boolean> c) throws Exception {
if (commitSemaphore.tryAcquire()) {
try {
@@ -118,6 +134,26 @@ public class SegmentNodeStore implements
}
/**
+ * Execute the passed callable with trying to acquire this store's commit lock.
+ * @param timeout the maximum time to wait for the store's commit lock
+ * @param unit the time unit of the {@code timeout} argument
+ * @param c callable to execute
+ * @return {@code false} if the store's commit lock cannot be acquired, the result
+ * of {@code c.call()} otherwise.
+ * @throws Exception
+ */
+ boolean locked(Callable<Boolean> c, long timeout, TimeUnit unit) throws Exception {
+ if (commitSemaphore.tryAcquire(timeout, unit)) {
+ try {
+ return c.call();
+ } finally {
+ commitSemaphore.release();
+ }
+ }
+ return false;
+ }
+
+ /**
* Refreshes the head state. Should only be called while holding a
* permit from the {@link #commitSemaphore}.
*/
@@ -166,6 +202,7 @@ public class SegmentNodeStore implements
commitSemaphore.release();
}
} catch (InterruptedException e) {
+ currentThread().interrupt();
throw new CommitFailedException(
"Segment", 2, "Merge interrupted", e);
} catch (SegmentOverflowException e) {
@@ -233,57 +270,71 @@ public class SegmentNodeStore implements
checkArgument(lifetime > 0);
checkNotNull(properties);
String name = UUID.randomUUID().toString();
- long now = System.currentTimeMillis();
+ try {
+ CPCreator cpc = new CPCreator(name, lifetime, properties);
+ if (locked(cpc, checkpointsLockWaitTime, TimeUnit.SECONDS)) {
+ return name;
+ }
+ log.warn("Failed to create checkpoint {} in {} seconds.", name,
+ checkpointsLockWaitTime);
+ } catch (InterruptedException e) {
+ currentThread().interrupt();
+ log.error("Failed to create checkpoint {}.", name, e);
+ } catch (Exception e) {
+ log.error("Failed to create checkpoint {}.", name, e);
+ }
+ return name;
+ }
- // try 5 times
- for (int i = 0; i < 5; i++) {
- if (commitSemaphore.tryAcquire()) {
- try {
- refreshHead();
+ private final class CPCreator implements Callable<Boolean> {
- SegmentNodeState state = head.get();
- SegmentNodeBuilder builder = state.builder();
+ private final String name;
+ private final long lifetime;
+ private final Map<String, String> properties;
- NodeBuilder checkpoints = builder.child("checkpoints");
- for (String n : checkpoints.getChildNodeNames()) {
- NodeBuilder cp = checkpoints.getChildNode(n);
- PropertyState ts = cp.getProperty("timestamp");
- if (ts == null
- || ts.getType() != Type.LONG
- || now > ts.getValue(Type.LONG)) {
- cp.remove();
- }
- }
+ CPCreator(String name, long lifetime, Map<String, String> properties) {
+ this.name = name;
+ this.lifetime = lifetime;
+ this.properties = properties;
+ }
- NodeBuilder cp = checkpoints.child(name);
- cp.setProperty("timestamp", now + lifetime);
- cp.setProperty("created", now);
-
- NodeBuilder props = cp.setChildNode("properties");
- for (Entry<String, String> p : properties.entrySet()) {
- props.setProperty(p.getKey(), p.getValue());
- }
+ @Override
+ public Boolean call() {
+ long now = System.currentTimeMillis();
- cp.setChildNode(ROOT, state.getChildNode(ROOT));
+ refreshHead();
- SegmentNodeState newState = builder.getNodeState();
- if (store.setHead(state, newState)) {
- refreshHead();
- return name;
- } else {
- log.debug(
- "Unable to update the head state for checkpoint {} ({}/5)",
- new Object[] { name, i + 1 });
- }
+ SegmentNodeState state = head.get();
+ SegmentNodeBuilder builder = state.builder();
- } finally {
- commitSemaphore.release();
+ NodeBuilder checkpoints = builder.child("checkpoints");
+ for (String n : checkpoints.getChildNodeNames()) {
+ NodeBuilder cp = checkpoints.getChildNode(n);
+ PropertyState ts = cp.getProperty("timestamp");
+ if (ts == null || ts.getType() != LONG
+ || now > ts.getValue(LONG)) {
+ cp.remove();
}
}
- }
- log.debug("Failed to create checkpoint {}", name);
- return name;
+ NodeBuilder cp = checkpoints.child(name);
+ cp.setProperty("timestamp", now + lifetime);
+ cp.setProperty("created", now);
+
+ NodeBuilder props = cp.setChildNode("properties");
+ for (Entry<String, String> p : properties.entrySet()) {
+ props.setProperty(p.getKey(), p.getValue());
+ }
+ cp.setChildNode(ROOT, state.getChildNode(ROOT));
+
+ SegmentNodeState newState = builder.getNodeState();
+ if (store.setHead(state, newState)) {
+ refreshHead();
+ return true;
+ } else {
+ return false;
+ }
+ }
}
@Override @Nonnull
@@ -294,7 +345,7 @@ public class SegmentNodeStore implements
@Nonnull
@Override
public Map<String, String> checkpointInfo(@Nonnull String checkpoint) {
- Map<String, String> properties = Maps.newHashMap();
+ Map<String, String> properties = newHashMap();
checkNotNull(checkpoint);
NodeState cp = head.get()
.getChildNode("checkpoints")
@@ -491,4 +542,11 @@ public class SegmentNodeStore implements
}
+ /**
+ * Sets the number of seconds to wait for the attempt to grab the lock to
+ * create a checkpoint
+ */
+ void setCheckpointsLockWaitTime(int checkpointsLockWaitTime) {
+ this.checkpointsLockWaitTime = checkpointsLockWaitTime;
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java?rev=1712788&r1=1712787&r2=1712788&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java Thu Nov 5 14:50:27 2015
@@ -16,12 +16,15 @@
*/
package org.apache.jackrabbit.oak.plugins.segment;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
@@ -87,4 +90,95 @@ public class CheckpointTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
+ /**
+ * OAK-3587 test simulates a timeout while trying to create a checkpoint,
+ * then releases the lock and tries again
+ */
+ @Test
+ public void testShortWait() throws Exception {
+ final SegmentNodeStore store = new SegmentNodeStore(new MemoryStore());
+ store.setCheckpointsLockWaitTime(1);
+
+ final Semaphore semaphore = new Semaphore(0);
+ final AtomicBoolean blocking = new AtomicBoolean(true);
+
+ final Callable<Boolean> block = new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() {
+ while (blocking.get()) {
+ if (semaphore.availablePermits() == 0) {
+ semaphore.release();
+ }
+ }
+ return true;
+ }
+ };
+
+ Thread background = new Thread() {
+ @Override
+ public void run() {
+ try {
+ store.locked(block);
+ } catch (Exception e) {
+ //
+ }
+ }
+ };
+
+ background.start();
+ semaphore.acquire();
+
+ String cp0 = store.checkpoint(10);
+ assertNull(store.retrieve(cp0));
+
+ blocking.set(false);
+ String cp1 = store.checkpoint(10);
+ assertNotNull(store.retrieve(cp1));
+ }
+
+ /**
+ * OAK-3587 test simulates a wait less than configured
+ * {@code SegmentNodeStore#setCheckpointsLockWaitTime(int)} value so the
+ * checkpoint call must return a valid value
+ */
+ @Test
+ public void testLongWait() throws Exception {
+ final int blockTime = 1;
+ final SegmentNodeStore store = new SegmentNodeStore(new MemoryStore());
+ store.setCheckpointsLockWaitTime(blockTime + 1);
+
+ final Semaphore semaphore = new Semaphore(0);
+
+ final Callable<Boolean> block = new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() {
+ try {
+ semaphore.release();
+ TimeUnit.SECONDS.sleep(blockTime);
+ } catch (InterruptedException e) {
+ //
+ }
+ return true;
+ }
+ };
+
+ Thread background = new Thread() {
+ @Override
+ public void run() {
+ try {
+ store.locked(block);
+ } catch (Exception e) {
+ //
+ }
+ }
+ };
+
+ background.start();
+ semaphore.acquire();
+
+ String cp0 = store.checkpoint(10);
+ assertNotNull(store.retrieve(cp0));
+ }
}