Author: chetanm
Date: Wed Nov 22 09:48:31 2017
New Revision: 1816019
URL: http://svn.apache.org/viewvc?rev=1816019&view=rev
Log:
OAK-6972 - DefaultIndexReader closes suggest directory multiple times
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java?rev=1816019&r1=1816018&r2=1816019&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
Wed Nov 22 09:48:31 2017
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -56,6 +57,7 @@ public class CopyOnReadDirectory extends
private final Directory local;
private final String indexPath;
private final Executor executor;
+ private final AtomicBoolean closed = new AtomicBoolean();
private final ConcurrentMap<String, CORFileReference> files =
newConcurrentMap();
/**
@@ -267,6 +269,9 @@ public class CopyOnReadDirectory extends
*/
@Override
public void close() throws IOException {
+ if (!closed.compareAndSet(false, true)){
+ return;
+ }
//Always remove old index file on close as it ensures that
//no other IndexSearcher are opened with previous revision of Index
due to
//way IndexTracker closes IndexNode. At max there would be only two
IndexNode
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java?rev=1816019&r1=1816018&r2=1816019&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
Wed Nov 22 09:48:31 2017
@@ -49,7 +49,7 @@ public class DefaultIndexReader implemen
closer.register(this.reader);
this.suggestDirectory = suggestDirectory;
if (suggestDirectory != null) {
- closer.register(this.suggestDirectory);
+ //Directory is closed by AnalyzingInfixSuggester close call
this.lookup = SuggestHelper.getLookup(suggestDirectory, analyzer);
closer.register(this.lookup);
} else {
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java?rev=1816019&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
(added)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
Wed Nov 22 09:48:31 2017
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.index.lucene.directory;
+
+import java.io.File;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.RAMDirectory;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import static
com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static org.junit.Assert.assertEquals;
+
+public class CopyOnReadDirectoryTest {
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder(new
File("target"));
+
+ @Test
+ public void multipleCloseCalls() throws Exception{
+ AtomicInteger executionCount = new AtomicInteger();
+ Executor e = r -> {executionCount.incrementAndGet(); r.run();};
+ IndexCopier c = new IndexCopier(sameThreadExecutor(),
temporaryFolder.newFolder(), true);
+ Directory dir = new CopyOnReadDirectory(c, new RAMDirectory(), new
RAMDirectory(), false, "foo", e);
+
+ dir.close();
+ dir.close();
+ assertEquals(1, executionCount.get());
+ }
+
+}
\ No newline at end of file
Propchange:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
