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 ch...@apache.org on 2014/09/19 14:31:54 UTC
svn commit: r1626191 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
api/jmx/IndexStatsMBean.java plugins/index/AsyncIndexUpdate.java
Author: chetanm
Date: Fri Sep 19 12:31:53 2014
New Revision: 1626191
URL: http://svn.apache.org/r1626191
Log:
OAK-2104 - IndexStatsMBean should expose the time upto which the repository state has been indexed
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java?rev=1626191&r1=1626190&r2=1626191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java Fri Sep 19 12:31:53 2014
@@ -48,6 +48,11 @@ public interface IndexStatsMBean {
String getStatus();
/**
+ * @return the last upto which the repository was indexed
+ */
+ String getLastIndexedTime();
+
+ /**
* Pauses the background indexing process. Future changes are not indexed
* until the {@link #resume()} method is called.
*
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1626191&r1=1626190&r2=1626191&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java Fri Sep 19 12:31:53 2014
@@ -39,6 +39,7 @@ import org.apache.jackrabbit.oak.api.jmx
import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler;
import org.apache.jackrabbit.oak.plugins.commit.ConflictHook;
import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
+import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.CompositeHook;
@@ -96,6 +97,12 @@ public class AsyncIndexUpdate implements
private final IndexEditorProvider provider;
+ /**
+ * Property name which stores the timestamp upto which the repository is
+ * indexed
+ */
+ private final String lastIndexedTo;
+
private final long lifetime = DEFAULT_LIFETIME; // TODO: make configurable
/** Flag to avoid repeatedly logging failure warnings */
@@ -117,6 +124,7 @@ public class AsyncIndexUpdate implements
public AsyncIndexUpdate(@Nonnull String name, @Nonnull NodeStore store,
@Nonnull IndexEditorProvider provider, boolean switchOnSync) {
this.name = checkNotNull(name);
+ this.lastIndexedTo = name + "-LastIndexedTo";
this.store = checkNotNull(store);
this.provider = checkNotNull(provider);
this.switchOnSync = switchOnSync;
@@ -271,6 +279,7 @@ public class AsyncIndexUpdate implements
}
// there are some recent changes, so let's create a new checkpoint
+ String afterTime = now();
String afterCheckpoint = store.checkpoint(lifetime);
NodeState after = store.retrieve(afterCheckpoint);
if (after == null) {
@@ -281,7 +290,7 @@ public class AsyncIndexUpdate implements
String checkpointToRelease = afterCheckpoint;
try {
- updateIndex(before, beforeCheckpoint, after, afterCheckpoint);
+ updateIndex(before, beforeCheckpoint, after, afterCheckpoint, afterTime);
// the update succeeded, i.e. it no longer fails
if (failing) {
@@ -319,7 +328,7 @@ public class AsyncIndexUpdate implements
private void updateIndex(
NodeState before, String beforeCheckpoint,
- NodeState after, String afterCheckpoint)
+ NodeState after, String afterCheckpoint, String afterTime)
throws CommitFailedException {
// start collecting runtime statistics
preAsyncRunStatsStats(indexStats);
@@ -340,6 +349,7 @@ public class AsyncIndexUpdate implements
}
builder.child(ASYNC).setProperty(name, afterCheckpoint);
+ builder.child(ASYNC).setProperty(PropertyStates.createProperty(lastIndexedTo, afterTime, Type.DATE));
if (callback.isDirty() || before == MISSING_NODE) {
if (switchOnSync) {
reindexedDefinitions.addAll(
@@ -417,7 +427,7 @@ public class AsyncIndexUpdate implements
return indexStats.getStatus() == STATUS_DONE;
}
- static final class AsyncIndexStats implements IndexStatsMBean {
+ final class AsyncIndexStats implements IndexStatsMBean {
private String start = "";
private String done = "";
@@ -456,6 +466,12 @@ public class AsyncIndexUpdate implements
return status;
}
+ @Override
+ public String getLastIndexedTime() {
+ PropertyState ps = store.getRoot().getChildNode(ASYNC).getProperty(lastIndexedTo);
+ return ps != null ? ps.getValue(Type.STRING) : null;
+ }
+
public void pause() {
log.debug("Pausing the async indexer");
this.isPaused = true;