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 2016/01/18 12:26:04 UTC
svn commit: r1725233 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/
Author: alexparvulescu
Date: Mon Jan 18 11:26:04 2016
New Revision: 1725233
URL: http://svn.apache.org/viewvc?rev=1725233&view=rev
Log:
OAK-3436 Prevent missing checkpoint due to unstable topology from causing complete reindexing
merged revisions 1718533, 1718547, 1718548, 1718802
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
- copied, changed from r1718533, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 18 11:26:04 2016
@@ -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,1681921,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
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,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,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,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,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1
710811,1710816,1710972,1711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723333,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216
+/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,1681921,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
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,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,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,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,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1
710811,1710816,1710972,1711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718533,1718547-1718548,1718626,1718646,1718801-1718802,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723333,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1725233&r1=1725232&r2=1725233&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java Mon Jan 18 11:26:04 2016
@@ -94,7 +94,7 @@ public class AsyncIndexUpdate implements
* timed out. Another node in cluster would wait for timeout before
* taking over a running job
*/
- private static final long ASYNC_TIMEOUT;
+ private static final long DEFAULT_ASYNC_TIMEOUT;
static {
int value = 15;
@@ -104,7 +104,7 @@ public class AsyncIndexUpdate implements
} catch (NumberFormatException e) {
// use default
}
- ASYNC_TIMEOUT = TimeUnit.MINUTES.toMillis(value);
+ DEFAULT_ASYNC_TIMEOUT = TimeUnit.MINUTES.toMillis(value);
}
private final String name;
@@ -136,6 +136,8 @@ public class AsyncIndexUpdate implements
private final MissingIndexProviderStrategy missingStrategy = new DefaultMissingIndexProviderStrategy();
+ private long leaseTimeOut;
+
/**
* Controls the length of the interval (in minutes) at which an indexing
* error is logged as 'warning'. for the rest of the indexing cycles errors
@@ -151,6 +153,7 @@ public class AsyncIndexUpdate implements
this.store = checkNotNull(store);
this.provider = checkNotNull(provider);
this.switchOnSync = switchOnSync;
+ this.leaseTimeOut = DEFAULT_ASYNC_TIMEOUT;
}
public AsyncIndexUpdate(@Nonnull String name, @Nonnull NodeStore store,
@@ -164,24 +167,47 @@ public class AsyncIndexUpdate implements
*
* @see <a href="https://issues.apache.org/jira/browse/OAK-1292">OAK-1292</a>
*/
- private class AsyncUpdateCallback implements IndexUpdateCallback {
+ protected static class AsyncUpdateCallback implements IndexUpdateCallback {
+
+ private final NodeStore store;
/** The base checkpoint */
private final String checkpoint;
+ private final String afterCheckpoint;
+
+ /**
+ * Property name which stores the temporary checkpoint that need to be released on the next run
+ */
+ private final String tempCpName;
+
+ private final long leaseTimeOut;
+
+ private final String name;
+
+ private final String leaseName;
+
+ private final AsyncIndexStats indexStats;
+
/** Expiration time of the last lease we committed */
private long lease;
- private final String leaseName;
- private final String tempCpName;
+ public AsyncUpdateCallback(NodeStore store, String name,
+ long leaseTimeOut, String checkpoint, String afterCheckpoint,
+ AsyncIndexStats indexStats) {
+ this.store = store;
+ this.name = name;
+ this.leaseTimeOut = leaseTimeOut;
+ this.checkpoint = checkpoint;
+ this.afterCheckpoint = afterCheckpoint;
+ this.tempCpName = getTempCpName(name);
+ this.indexStats = indexStats;
+ this.leaseName = leasify(name);
+ }
- public AsyncUpdateCallback(String checkpoint, String afterCheckpoint)
- throws CommitFailedException {
+ protected void prepare() throws CommitFailedException {
long now = System.currentTimeMillis();
- this.checkpoint = checkpoint;
- this.lease = now + 2 * ASYNC_TIMEOUT;
- this.leaseName = name + "-lease";
- this.tempCpName = name + "-temp";
+ this.lease = now + 2 * leaseTimeOut;
NodeState root = store.getRoot();
long beforeLease = root.getChildNode(ASYNC).getLong(leaseName);
@@ -192,8 +218,9 @@ public class AsyncIndexUpdate implements
NodeBuilder builder = root.builder();
NodeBuilder async = builder.child(ASYNC);
async.setProperty(leaseName, lease);
+ mergeWithConcurrencyCheck(store, builder, checkpoint, beforeLease, name);
updateTempCheckpoints(async, checkpoint, afterCheckpoint);
- mergeWithConcurrencyCheck(builder, checkpoint, beforeLease);
+ mergeWithConcurrencyCheck(store, builder, checkpoint, lease, name);
// reset updates counter
indexStats.resetUpdates();
@@ -239,23 +266,22 @@ public class AsyncIndexUpdate implements
NodeBuilder builder = store.getRoot().builder();
NodeBuilder async = builder.child(ASYNC);
async.removeProperty(leaseName);
- mergeWithConcurrencyCheck(builder, async.getString(name), lease);
+ mergeWithConcurrencyCheck(store, builder, async.getString(name), lease, name);
}
@Override
public void indexUpdate() throws CommitFailedException {
if (indexStats.incUpdates() % 100 == 0) {
long now = System.currentTimeMillis();
- if (now + ASYNC_TIMEOUT > lease) {
- long newLease = now + 2 * ASYNC_TIMEOUT;
+ if (now + leaseTimeOut > lease) {
+ long newLease = now + 2 * leaseTimeOut;
NodeBuilder builder = store.getRoot().builder();
builder.child(ASYNC).setProperty(leaseName, newLease);
- mergeWithConcurrencyCheck(builder, checkpoint, lease);
+ mergeWithConcurrencyCheck(store, builder, checkpoint, lease, name);
lease = newLease;
}
}
}
-
}
@Override
@@ -269,11 +295,13 @@ public class AsyncIndexUpdate implements
// check for concurrent updates
NodeState async = root.getChildNode(ASYNC);
- long leaseEndTime = async.getLong(name + "-lease");
+ long leaseEndTime = async.getLong(leasify(name));
long currentTime = System.currentTimeMillis();
if (leaseEndTime > currentTime) {
- log.debug("Another copy of the {} index update is already running;"
- + " skipping this update. Time left for lease to expire {}s", name, (leaseEndTime - currentTime)/1000);
+ long leaseExpMsg = (leaseEndTime - currentTime) / 1000;
+ String err = "Another copy of the index update is already running; skipping this update. Time left for lease to expire "
+ + leaseExpMsg + "s";
+ indexStats.failed(new Exception(err, CONCURRENT_UPDATE));
return;
}
@@ -353,8 +381,14 @@ public class AsyncIndexUpdate implements
}
}
- private boolean updateIndex(
- NodeState before, String beforeCheckpoint,
+ protected AsyncUpdateCallback newAsyncUpdateCallback(NodeStore store,
+ String name, long leaseTimeOut, String beforeCheckpoint,
+ String afterCheckpoint, AsyncIndexStats indexStats) {
+ return new AsyncUpdateCallback(store, name, leaseTimeOut,
+ beforeCheckpoint, afterCheckpoint, indexStats);
+ }
+
+ private boolean updateIndex(NodeState before, String beforeCheckpoint,
NodeState after, String afterCheckpoint, String afterTime)
throws CommitFailedException {
Stopwatch watch = Stopwatch.createStarted();
@@ -362,8 +396,9 @@ public class AsyncIndexUpdate implements
boolean progressLogged = false;
// create an update callback for tracking index updates
// and maintaining the update lease
- AsyncUpdateCallback callback =
- new AsyncUpdateCallback(beforeCheckpoint, afterCheckpoint);
+ AsyncUpdateCallback callback = newAsyncUpdateCallback(store, name,
+ leaseTimeOut, beforeCheckpoint, afterCheckpoint, indexStats);
+ callback.prepare();
try {
NodeBuilder builder = store.getRoot().builder();
@@ -406,7 +441,8 @@ public class AsyncIndexUpdate implements
}
updatePostRunStatus = true;
}
- mergeWithConcurrencyCheck(builder, beforeCheckpoint, callback.lease);
+ mergeWithConcurrencyCheck(store, builder, beforeCheckpoint,
+ callback.lease, name);
if (indexUpdate.isReindexingPerformed()) {
log.info("Reindexing ({}) completed for indexes: {} in {}", name, indexUpdate.getReindexStats(), watch);
progressLogged = true;
@@ -428,9 +464,17 @@ public class AsyncIndexUpdate implements
return updatePostRunStatus;
}
- private void mergeWithConcurrencyCheck(
- NodeBuilder builder, final String checkpoint, final long lease)
- throws CommitFailedException {
+ private static String leasify(String name) {
+ return name + "-lease";
+ }
+
+ private static String getTempCpName(String name) {
+ return name + "-temp";
+ }
+
+ private static void mergeWithConcurrencyCheck(final NodeStore store,
+ NodeBuilder builder, final String checkpoint, final long lease,
+ final String name) throws CommitFailedException {
CommitHook concurrentUpdateCheck = new CommitHook() {
@Override @Nonnull
public NodeState processCommit(
@@ -438,8 +482,9 @@ public class AsyncIndexUpdate implements
throws CommitFailedException {
// check for concurrent updates by this async task
NodeState async = before.getChildNode(ASYNC);
- if (checkpoint == null || Objects.equal(checkpoint, async.getString(name))
- && lease == async.getLong(name + "-lease")) {
+ if ((checkpoint == null || Objects.equal(checkpoint,
+ async.getString(name)))
+ && lease == async.getLong(leasify(name))) {
return after;
} else {
throw CONCURRENT_UPDATE;
@@ -462,6 +507,14 @@ public class AsyncIndexUpdate implements
}
}
+ /**
+ * Milliseconds for the timeout
+ */
+ protected AsyncIndexUpdate setLeaseTimeOut(long leaseTimeOut) {
+ this.leaseTimeOut = leaseTimeOut;
+ return this;
+ }
+
private static void preAsyncRunStatsStats(AsyncIndexStats stats) {
stats.start(now());
}
Copied: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java (from r1718533, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java&r1=1718533&r2=1725233&rev=1725233&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java Mon Jan 18 11:26:04 2016
@@ -39,7 +39,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
@@ -80,7 +79,6 @@ public class AsyncIndexUpdateLeaseTest e
}
@Test
- @Ignore("OAK-3436")
public void testPrePrepare() throws Exception {
// take care of initial reindex before
new AsyncIndexUpdate(name, store, provider).run();
@@ -241,7 +239,6 @@ public class AsyncIndexUpdateLeaseTest e
@Test
public void testPrePrepareRexindex() throws Exception {
-
final IndexStatusListener l1 = new IndexStatusListener() {
@Override
@@ -295,6 +292,66 @@ public class AsyncIndexUpdateLeaseTest e
assertRunOk(new SpecialAsyncIndexUpdate(name, store, provider, l1));
}
+ @Test
+ public void testPostPrepareReindexLeaseExpired() throws Exception {
+ final long lease = 50;
+ final IndexStatusListener l1 = new IndexStatusListener() {
+
+ @Override
+ protected void postPrepare() {
+ executed.set(true);
+ try {
+ TimeUnit.MILLISECONDS.sleep(lease * 3);
+ } catch (InterruptedException e) {
+ //
+ }
+ assertRunOk(new AsyncIndexUpdate(name, store, provider));
+ }
+ };
+ assertRunKo(new SpecialAsyncIndexUpdate(name, store, provider, l1)
+ .setLeaseTimeOut(lease));
+ }
+
+ @Test
+ public void testPreIndexUpdateReindexLeaseExpired() throws Exception {
+ final long lease = 50;
+ final IndexStatusListener l1 = new IndexStatusListener() {
+
+ @Override
+ protected void preIndexUpdate() {
+ executed.set(true);
+ try {
+ TimeUnit.MILLISECONDS.sleep(lease * 3);
+ } catch (InterruptedException e) {
+ //
+ }
+ assertRunOk(new AsyncIndexUpdate(name, store, provider));
+ }
+ };
+ assertRunKo(new SpecialAsyncIndexUpdate(name, store, provider, l1)
+ .setLeaseTimeOut(lease));
+ }
+
+ @Test
+ public void testPostIndexUpdateReindexLeaseExpired() throws Exception {
+ final long lease = 50;
+ final IndexStatusListener l1 = new IndexStatusListener() {
+
+ @Override
+ protected void postIndexUpdate() {
+ executed.set(true);
+ try {
+ TimeUnit.MILLISECONDS.sleep(lease * 3);
+ } catch (InterruptedException e) {
+ //
+ }
+ assertRunOk(new AsyncIndexUpdate(name, store, provider));
+ }
+ };
+ assertRunKo(new SpecialAsyncIndexUpdate(name, store, provider, l1)
+ .setLeaseTimeOut(lease));
+ }
+
// -------------------------------------------------------------------
private static String getReferenceCp(NodeStore store, String name) {
@@ -311,9 +368,9 @@ public class AsyncIndexUpdateLeaseTest e
assertConcurrentUpdate(a.getIndexStats());
}
- private void assertRun(AsyncIndexUpdate a, boolean status) {
+ private void assertRun(AsyncIndexUpdate a, boolean failing) {
a.run();
- assertEquals("Unexpected failiure flag", status, a.isFailing());
+ assertEquals("Unexpected failiure flag", failing, a.isFailing());
}
private void assertConcurrentUpdate(AsyncIndexStats stats) {
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1725233&r1=1725232&r2=1725233&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java Mon Jan 18 11:26:04 2016
@@ -36,6 +36,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -60,6 +61,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.spi.state.ProxyNodeStore;
import org.junit.Test;
import ch.qos.logback.classic.Level;
@@ -583,6 +585,88 @@ public class AsyncIndexUpdateTest {
assertEquals("", stats.getFailingSince());
}
+ @Test
+ public void cpCleanupNoRelease() throws Exception {
+ final MemoryNodeStore mns = new MemoryNodeStore();
+ final AtomicBoolean canRelease = new AtomicBoolean(false);
+
+ ProxyNodeStore store = new ProxyNodeStore() {
+
+ @Override
+ protected NodeStore getNodeStore() {
+ return mns;
+ }
+
+ @Override
+ public boolean release(String checkpoint) {
+ if (canRelease.get()) {
+ return super.release(checkpoint);
+ }
+ return false;
+ }
+ };
+
+ IndexEditorProvider provider = new PropertyIndexEditorProvider();
+
+ NodeBuilder builder = store.getRoot().builder();
+ createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "rootIndex", true, false, ImmutableSet.of("foo"), null)
+ .setProperty(ASYNC_PROPERTY_NAME, "async");
+ builder.child("testRoot").setProperty("foo", "abc");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ assertTrue("Expecting no checkpoints",
+ mns.listCheckpoints().size() == 0);
+
+ AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider);
+ async.run();
+ assertTrue("Expecting one checkpoint",
+ mns.listCheckpoints().size() == 1);
+ assertTrue(
+ "Expecting one temp checkpoint",
+ newHashSet(
+ store.getRoot().getChildNode(AsyncIndexUpdate.ASYNC)
+ .getStrings("async-temp")).size() == 1);
+
+ builder = store.getRoot().builder();
+ builder.child("testRoot").setProperty("foo", "def");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ async.run();
+ assertTrue("Expecting two checkpoints",
+ mns.listCheckpoints().size() == 2);
+ assertTrue(
+ "Expecting two temp checkpoints",
+ newHashSet(
+ store.getRoot().getChildNode(AsyncIndexUpdate.ASYNC)
+ .getStrings("async-temp")).size() == 2);
+
+ canRelease.set(true);
+
+ builder = store.getRoot().builder();
+ builder.child("testRoot").setProperty("foo", "ghi");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ async.run();
+
+ assertTrue("Expecting one checkpoint",
+ mns.listCheckpoints().size() == 1);
+ String secondCp = mns.listCheckpoints().iterator().next();
+ assertEquals(
+ secondCp,
+ store.getRoot().getChildNode(AsyncIndexUpdate.ASYNC)
+ .getString("async"));
+ // the temp cps size is 2 now but the unreferenced checkpoints have been
+ // cleared from the store already
+ for (String cp : store.getRoot().getChildNode(AsyncIndexUpdate.ASYNC)
+ .getStrings("async-temp")) {
+ if (cp.equals(secondCp)) {
+ continue;
+ }
+ assertNull("Temp checkpoint was already cleared from store",
+ store.retrieve(cp));
+ }
+ }
+
/**
* OAK-2203 Test reindex behavior on an async index when the index provider is missing
* for a given type