Author: chetanm
Date: Fri Jul 31 06:54:34 2015
New Revision: 1693531
URL: http://svn.apache.org/r1693531
Log:
OAK-3155 - AsyncIndex stats do not capture execution for runs where no indexing
is performed
Merging 1693526
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 Fri Jul 31 06:54:34 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,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,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
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,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,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
/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=1693531&r1=1693530&r2=1693531&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
Fri Jul 31 06:54:34 2015
@@ -272,6 +272,9 @@ public class AsyncIndexUpdate implements
return;
}
+ // start collecting runtime statistics
+ preAsyncRunStatsStats(indexStats);
+
// find the last indexed state, and check if there are recent changes
NodeState before;
String beforeCheckpoint = async.getString(name);
@@ -286,6 +289,7 @@ public class AsyncIndexUpdate implements
} else if (noVisibleChanges(state, root)) {
log.debug("No changes since last checkpoint;"
+ " skipping the {} index update", name);
+ postAsyncRunStatsStatus(indexStats);
return;
} else {
before = state;
@@ -304,12 +308,15 @@ public class AsyncIndexUpdate implements
if (after == null) {
log.debug("Unable to retrieve newly created checkpoint {},"
+ " skipping the {} index update", afterCheckpoint, name);
+ //Do not update the status as technically the run is not complete
return;
}
String checkpointToRelease = afterCheckpoint;
+ boolean updatePostRunStatus = false;
try {
- updateIndex(before, beforeCheckpoint, after, afterCheckpoint,
afterTime);
+ updatePostRunStatus = updateIndex(before, beforeCheckpoint,
+ after, afterCheckpoint, afterTime);
// the update succeeded, i.e. it no longer fails
if (failing) {
@@ -342,18 +349,20 @@ public class AsyncIndexUpdate implements
checkpointToRelease);
}
}
+
+ if (updatePostRunStatus) {
+ postAsyncRunStatsStatus(indexStats);
+ }
}
}
- private void updateIndex(
+ private boolean updateIndex(
NodeState before, String beforeCheckpoint,
NodeState after, String afterCheckpoint, String afterTime)
throws CommitFailedException {
Stopwatch watch = Stopwatch.createStarted();
+ boolean updatePostRunStatus = true;
boolean progressLogged = false;
- // start collecting runtime statistics
- preAsyncRunStatsStats(indexStats);
-
// create an update callback for tracking index updates
// and maintaining the update lease
AsyncUpdateCallback callback =
@@ -372,7 +381,6 @@ public class AsyncIndexUpdate implements
builder.child(ASYNC).setProperty(name, afterCheckpoint);
builder.child(ASYNC).setProperty(PropertyStates.createProperty(lastIndexedTo,
afterTime, Type.DATE));
- boolean updatePostRunStatus = true;
if (callback.isDirty() || before == MISSING_NODE) {
if (switchOnSync) {
reindexedDefinitions.addAll(indexUpdate
@@ -402,9 +410,6 @@ public class AsyncIndexUpdate implements
updatePostRunStatus = true;
}
mergeWithConcurrencyCheck(builder, beforeCheckpoint,
callback.lease);
- if (updatePostRunStatus) {
- postAsyncRunStatsStatus(indexStats);
- }
if (indexUpdate.isReindexingPerformed()) {
log.info("Reindexing ({}) completed for indexes: {} in {}",
name, indexUpdate.getReindexStats(), watch);
progressLogged = true;
@@ -422,6 +427,8 @@ public class AsyncIndexUpdate implements
log.debug(msg, name, watch, callback.updates);
}
}
+
+ return updatePostRunStatus;
}
private void mergeWithConcurrencyCheck(
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=1693531&r1=1693530&r2=1693531&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
Fri Jul 31 06:54:34 2015
@@ -37,6 +37,7 @@ import java.util.concurrent.Semaphore;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import javax.management.openmbean.CompositeData;
import ch.qos.logback.classic.Level;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -683,6 +684,71 @@ public class AsyncIndexUpdateTest {
}
@Test
+ public void testAsyncExecutionStats() throws Exception {
+ final Set<String> knownCheckpoints = Sets.newHashSet();
+ MemoryNodeStore store = new MemoryNodeStore(){
+ @Override
+ public synchronized NodeState retrieve(@Nonnull String checkpoint)
{
+ if (!knownCheckpoints.isEmpty() &&
!knownCheckpoints.contains(checkpoint)){
+ return null;
+ }
+ return super.retrieve(checkpoint);
+ }
+ };
+ 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");
+
+ // merge it back in
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ AsyncIndexUpdate async = new AsyncIndexUpdate("async", store,
provider);
+ runOneCycle(async);
+ assertEquals(1,
lastExecutionStats(async.getIndexStats().getExecutionCount()));
+
+ //Run a cycle so that change of reindex flag gets indexed
+ runOneCycle(async);
+ assertEquals(1,
lastExecutionStats(async.getIndexStats().getExecutionCount()));
+
+ //Now run so that it results in an empty cycle
+ runOneCycle(async);
+ assertEquals(1,
lastExecutionStats(async.getIndexStats().getExecutionCount()));
+
+ //Do some updates and counter should increase
+ builder = store.getRoot().builder();
+ builder.child("testRoot2").setProperty("foo", "abc");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ runOneCycle(async);
+ assertEquals(1,
lastExecutionStats(async.getIndexStats().getExecutionCount()));
+
+ //Do some updates but disable checkpoints. Counter should not increase
+ builder = store.getRoot().builder();
+ builder.child("testRoot3").setProperty("foo", "abc");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ //Disable new checkpoint retrieval
+ knownCheckpoints.addAll(store.listCheckpoints());
+ runOneCycle(async);
+ assertEquals(0,
lastExecutionStats(async.getIndexStats().getExecutionCount()));
+ }
+
+
+ private static long lastExecutionStats(CompositeData cd){
+ //Last stat is the last entry in the array
+ return ((long[]) cd.get("per second"))[59];
+ }
+
+ private static void runOneCycle(AsyncIndexUpdate async){
+ async.run();
+ async.getIndexStats().run();
+ }
+
+ @Test
public void checkpointStability() throws Exception{
NodeStore store = new MemoryNodeStore();
IndexEditorProvider provider = new PropertyIndexEditorProvider();
