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 2015/06/30 14:15:35 UTC
svn commit: r1688440 - in /jackrabbit/oak/branches/1.2: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
Author: chetanm
Date: Tue Jun 30 12:15:35 2015
New Revision: 1688440
URL: http://svn.apache.org/r1688440
Log:
OAK-3053 - Locking issues seen with CopyOnWrite mode enabled
Merging 1688421,1688436
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 12:15:35 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,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,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,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686162,1686229,1686234,1686253,1686414,1686780
,1686854,1686857,1686971,1687053-1687055,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688349
+/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,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,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,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686162,1686229,1686234,1686253,1686414,1686780
,1686854,1686857,1686971,1687053-1687055,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688349,1688421,1688436
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java?rev=1688440&r1=1688439&r2=1688440&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java Tue Jun 30 12:15:35 2015
@@ -56,7 +56,6 @@ import com.google.common.collect.Iterabl
import com.google.common.collect.Sets;
import com.google.common.hash.Hashing;
import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.oak.commons.IOUtils;
import org.apache.jackrabbit.oak.commons.concurrent.NotifyingFutureTask;
import org.apache.jackrabbit.oak.util.PerfLogger;
import org.apache.lucene.store.Directory;
@@ -65,6 +64,7 @@ import org.apache.lucene.store.FilterDir
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.store.NoLockFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -147,7 +147,10 @@ public class IndexCopier implements Copy
String newVersion = String.valueOf(definition.getReindexCount());
indexWriterDir = getVersionedDir(indexPath, indexDir, newVersion);
}
- Directory dir = FSDirectory.open(indexWriterDir);
+
+ //By design indexing in Oak is single threaded so Lucene locking
+ //can be disabled
+ Directory dir = FSDirectory.open(indexWriterDir, NoLockFactory.getNoLockFactory());
log.debug("IndexWriter would use {}", indexWriterDir);
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java?rev=1688440&r1=1688439&r2=1688440&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java Tue Jun 30 12:15:35 2015
@@ -23,11 +23,23 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
+import org.apache.jackrabbit.oak.plugins.index.IndexEditor;
+import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
+import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
+import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
+import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -43,7 +55,10 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import static com.google.common.collect.ImmutableSet.of;
import static javax.jcr.PropertyType.TYPENAME_STRING;
@@ -76,6 +91,9 @@ public class LuceneIndexEditorTest {
private IndexNode indexNode;
+ @Rule
+ public final TemporaryFolder temporaryFolder = new TemporaryFolder();
+
@Test
public void testLuceneWithFullText() throws Exception {
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
@@ -316,6 +334,50 @@ public class LuceneIndexEditorTest {
assertFalse(defn.isOfOldFormat());
}
+ @Test
+ public void copyOnWriteAndLocks() throws Exception {
+ ExecutorService executorService = Executors.newFixedThreadPool(2);
+ IndexCopier copier = new IndexCopier(executorService, temporaryFolder.getRoot());
+
+ FailOnDemandEditorProvider failingProvider = new FailOnDemandEditorProvider();
+ EditorHook hook = new EditorHook(
+ new IndexUpdateProvider(
+ new CompositeIndexEditorProvider(
+ failingProvider,
+ new LuceneIndexEditorProvider(copier))));
+
+ NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
+ NodeBuilder nb = newLuceneIndexDefinitionV2(index, "lucene", of(TYPENAME_STRING));
+ nb.setProperty(LuceneIndexConstants.INDEX_PATH, "foo");
+ IndexUtils.createIndexDefinition(index, "failingIndex", false, false, of("foo"), null);
+
+
+ //1. Get initial set indexed. So that next cycle is normal indexing
+ NodeState indexed = hook.processCommit(EMPTY_NODE, builder.getNodeState(), CommitInfo.EMPTY);
+ builder = indexed.builder();
+
+ NodeState before = indexed;
+ builder.child("test").setProperty("a", "fox is jumping");
+ NodeState after = builder.getNodeState();
+
+ //2. Ensure that Lucene gets triggered but close is not called
+ failingProvider.setShouldFail(true);
+ try {
+ hook.processCommit(before, after, CommitInfo.EMPTY);
+ fail();
+ } catch (CommitFailedException ignore){
+
+ }
+
+ //3. Disable the troubling editor
+ failingProvider.setShouldFail(false);
+
+ //4. Now commit should process fine
+ hook.processCommit(before, after, CommitInfo.EMPTY);
+
+ executorService.shutdown();
+ }
+
//@Test
public void checkLuceneIndexFileUpdates() throws Exception{
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
@@ -409,4 +471,38 @@ public class LuceneIndexEditorTest {
return FieldFactory.dateToLong(ISO8601.format(createCal(dt)));
}
+ private static class FailOnDemandEditorProvider implements IndexEditorProvider {
+
+ private boolean shouldFail;
+
+ @Override
+ public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
+ @Nonnull NodeState root,
+ @Nonnull IndexUpdateCallback callback) throws CommitFailedException {
+ if (PropertyIndexEditorProvider.TYPE.equals(type)) {
+ return new FailOnDemandEditor();
+ }
+ return null;
+ }
+
+ public void setShouldFail(boolean shouldFail) {
+ this.shouldFail = shouldFail;
+ }
+
+ private class FailOnDemandEditor extends DefaultEditor implements IndexEditor {
+ @Override
+ public void leave(NodeState before, NodeState after)
+ throws CommitFailedException {
+ throwExceptionIfTold();
+ super.leave(before, after);
+ }
+
+ void throwExceptionIfTold() throws CommitFailedException {
+ if (shouldFail) {
+ throw new CommitFailedException("commit",1 , null);
+ }
+ }
+ }
+ }
+
}