Author: catholicon
Date: Wed Apr 24 08:11:58 2019
New Revision: 1858033
URL: http://svn.apache.org/viewvc?rev=1858033&view=rev
Log:
OAK-8258: Active deletion can delete blobs despite indexing cycle deleting them
failed (backport r1857936, r1858032 from trunk)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
jackrabbit/oak/branches/1.10/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 24 08:11:58 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635,1857638,1857640,1857687,1857936,1858032
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1858033&r1=1858032&r2=1858033&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Wed Apr 24 08:11:58 2019
@@ -713,6 +713,7 @@ public class AsyncIndexUpdate implements
// task will take care of it
taskSplitter.maybeSplit(beforeCheckpoint, callback.lease);
IndexUpdate indexUpdate = null;
+ boolean indexingFailed = true;
try {
NodeBuilder builder = store.getRoot().builder();
@@ -768,6 +769,8 @@ public class AsyncIndexUpdate implements
}
mergeWithConcurrencyCheck(store, validatorProviders, builder,
beforeCheckpoint,
callback.lease, name);
+ indexingFailed = false;
+
if (indexUpdate.isReindexingPerformed()) {
log.info("[{}] Reindexing completed for indexes: {} in {} ({}
ms)",
name, indexUpdate.getReindexStats(),
@@ -778,7 +781,7 @@ public class AsyncIndexUpdate implements
corruptIndexHandler.markWorkingIndexes(indexUpdate.getUpdatedIndexPaths());
} finally {
if (indexUpdate != null) {
- if (updatePostRunStatus) {
+ if ( !indexingFailed ) {
indexUpdate.commitProgress(IndexCommitCallback.IndexProgress.COMMIT_SUCCEDED);
} else {
indexUpdate.commitProgress(IndexCommitCallback.IndexProgress.COMMIT_FAILED);
Modified:
jackrabbit/oak/branches/1.10/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1858033&r1=1858032&r2=1858033&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Wed Apr 24 08:11:58 2019
@@ -74,6 +74,7 @@ import org.apache.jackrabbit.oak.query.i
import org.apache.jackrabbit.oak.spi.commit.CommitContext;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
import org.apache.jackrabbit.oak.spi.commit.DefaultValidator;
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
@@ -1936,6 +1937,69 @@ public class AsyncIndexUpdateTest {
supersedingIndex.hasProperty(DISABLE_INDEXES_ON_NEXT_CYCLE));
}
+ @Test
+ public void indexCommitCallback() throws Exception {
+ AtomicBoolean gotFailedCommit = new AtomicBoolean();
+ AtomicBoolean gotSuccessfulCommit = new AtomicBoolean();
+ AtomicBoolean shouldFail = new AtomicBoolean();
+
+ MemoryNodeStore store = new MemoryNodeStore();
+
+ AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, (type,
definition, root, callback) -> {
+ IndexingContext indexingContext =
((ContextAwareCallback)callback).getIndexingContext();
+ indexingContext.registerIndexCommitCallback(indexProgress -> {
+ switch (indexProgress) {
+ case COMMIT_FAILED:
+ gotFailedCommit.set(true);
+ break;
+ case COMMIT_SUCCEDED:
+ gotSuccessfulCommit.set(true);
+ break;
+ }
+ });
+
+ if (shouldFail.get()) {
+ throw new CommitFailedException("indexer-fail", 1, "Explicitly
failing while indexing");
+ }
+ return new DefaultEditor();
+ });
+
+ // Make index
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child("oak:index").child("fooIndex").setProperty("async",
"async").setProperty("type", "foo");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ // reset stats
+ gotFailedCommit.set(false);
+ gotSuccessfulCommit.set(false);
+
+ // make some change which should succeed
+ builder = store.getRoot().builder();
+ builder.setProperty("foo", "bar");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ async.run();
+
+ assertTrue("Successful indexing commit must report success",
gotSuccessfulCommit.get());
+ assertFalse("Successful indexing commit must not report failure",
gotFailedCommit.get());
+
+ // reset stats
+ gotFailedCommit.set(false);
+ gotSuccessfulCommit.set(false);
+
+ // make another change that should fail
+ shouldFail.set(true);
+
+ builder = store.getRoot().builder();
+ builder.setProperty("foo", "bar1");
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ async.run();
+
+ assertFalse("Failing indexing must not report success",
gotSuccessfulCommit.get());
+ assertTrue("Failing indexing must report failure",
gotFailedCommit.get());
+ }
+
private static class TestIndexEditorProvider extends
PropertyIndexEditorProvider {
private String indexPathToFail;
@Override
Modified:
jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java?rev=1858033&r1=1858032&r2=1858033&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
Wed Apr 24 08:11:58 2019
@@ -21,6 +21,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.core.data.FileDataStore;
import org.apache.jackrabbit.oak.InitialContent;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -36,10 +37,17 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.DefaultValidator;
import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.apache.jackrabbit.oak.spi.commit.Validator;
+import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider;
import org.apache.jackrabbit.oak.spi.mount.Mounts;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -50,9 +58,11 @@ import org.junit.runners.Parameterized;
import java.io.File;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import static com.google.common.collect.ImmutableSet.of;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
@@ -66,6 +76,8 @@ public class ActiveDeletedBlobCollection
private final DataStoreType dataStoreType;
+ private FailOnDemandValidatorProvider failOnDemandValidatorProvider;
+
@BeforeClass
public static void assumeMongo() {
assumeTrue(MongoUtils.isAvailable());
@@ -117,7 +129,11 @@ public class ActiveDeletedBlobCollection
.setMongoDB(mongoConnection.getMongoClient(),
mongoConnection.getDBName())
.setBlobStore(this.blobStore)
.getNodeStore();
+
+ failOnDemandValidatorProvider = new FailOnDemandValidatorProvider();
asyncIndexUpdate = new AsyncIndexUpdate("async", nodeStore,
editorProvider);
+
asyncIndexUpdate.setValidatorProviders(Collections.singletonList(failOnDemandValidatorProvider));
+
return new Oak(nodeStore)
.with(new InitialContent())
.with(new OpenSecurityProvider())
@@ -172,4 +188,63 @@ public class ActiveDeletedBlobCollection
assertTrue("Second GC should delete some chunks too",
secondGCNumChunks < firstGCNumChunks);
}
+ @Test
+ public void dontDeleteIfIndexingFailed() throws Exception {
+ createIndex("test1", of("propa"));
+ root.getTree("/oak:index/counter").remove();
+ root.commit();
+ asyncIndexUpdate.run();
+ long initialNumChunks = blobStore.numChunks;
+
+ root.getTree("/").addChild("test").setProperty("propa", "foo");
+ root.commit();
+ asyncIndexUpdate.run();
+ long firstCommitNumChunks = blobStore.numChunks;
+ adbc.purgeBlobsDeleted(0, blobStore);//hack to purge file
+ long time = clock.getTimeIncreasing();
+ long hackPurgeNumChunks = blobStore.numChunks;
+ Assert.assertEquals("Hack purge must not purge any blob (first
commit)",
+ firstCommitNumChunks, hackPurgeNumChunks);
+
+ failOnDemandValidatorProvider.shouldFail = true;
+
+ root.getTree("/").addChild("test").setProperty("propa", "foo1");
+ root.commit();
+ asyncIndexUpdate.run();
+ assertTrue("Indexing must have failed", asyncIndexUpdate.isFailing());
+ long secondCommitNumChunks = blobStore.numChunks;
+ adbc.purgeBlobsDeleted(0, blobStore);//hack to purge file
+ hackPurgeNumChunks = blobStore.numChunks;
+ Assert.assertEquals("Hack purge must not purge any blob (second
commit)",
+ secondCommitNumChunks, hackPurgeNumChunks);
+
+ adbc.purgeBlobsDeleted(time, blobStore);
+ long firstGCNumChunks = blobStore.numChunks;
+ adbc.purgeBlobsDeleted(clock.getTimeIncreasing(), blobStore);
+ long secondGCNumChunks = blobStore.numChunks;
+
+ assertTrue("First commit must create some chunks",
firstCommitNumChunks > initialNumChunks);
+ assertTrue("Second commit must create some chunks",
secondCommitNumChunks > firstCommitNumChunks);
+ assertTrue("First GC should delete some chunks", firstGCNumChunks <
secondCommitNumChunks);
+ assertEquals("Second GC must not delete chunks as commit failed",
firstGCNumChunks, secondGCNumChunks);
+ }
+
+ private static class FailOnDemandValidatorProvider extends
ValidatorProvider {
+ boolean shouldFail;
+
+ @Override
+ protected @Nullable Validator getRootValidator(NodeState before,
NodeState after, CommitInfo info) {
+ return new DefaultValidator() {
+ @Override
+ public Validator childNodeChanged(String name, NodeState
before, NodeState after) throws CommitFailedException {
+ if (shouldFail &&
FulltextIndexConstants.INDEX_DATA_CHILD_NAME.equals(name)) {
+ throw new CommitFailedException("failing-validator",
1, "Failed commit as requested");
+ }
+
+ return this;
+ }
+ };
+ }
+ }
+
}
