Author: catholicon
Date: Wed Apr 24 08:22:22 2019
New Revision: 1858034
URL: http://svn.apache.org/viewvc?rev=1858034&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.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 24 08:22:22 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239
,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847088,1847
096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850874,1851533-1851535,1851619,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854455,1854461-1854462,1854466,1854515,1854539,1854701,1854773,1854827,1854848,1854859,1854930,1855032,1855776,1856818,1857010,1857247,1857253,1857294,1857314,1857638
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239
,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847088,1847
096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850874,1851533-1851535,1851619,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854455,1854461-1854462,1854466,1854515,1854539,1854701,1854773,1854827,1854848,1854859,1854930,1855032,1855776,1856818,1857010,1857247,1857253,1857294,1857314,1857638,1857936,1858032
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1858034&r1=1858033&r2=1858034&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Wed Apr 24 08:22:22 2019
@@ -712,6 +712,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();
@@ -767,6 +768,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(),
@@ -777,7 +780,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.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1858034&r1=1858033&r2=1858034&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Wed Apr 24 08:22:22 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.8/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.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java?rev=1858034&r1=1858033&r2=1858034&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
Wed Apr 24 08:22:22 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;
@@ -32,14 +33,21 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
import org.apache.jackrabbit.oak.plugins.index.lucene.ExtractedTextCache;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
+import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
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.lucene.directory.ActiveDeletedBlobCollectorFactory.ActiveDeletedBlobCollectorImpl;
+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.getDB())
.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 &&
LuceneIndexConstants.INDEX_DATA_CHILD_NAME.equals(name)) {
+ throw new CommitFailedException("failing-validator",
1, "Failed commit as requested");
+ }
+
+ return this;
+ }
+ };
+ }
+ }
+
}
