lock directory when checkIndex

Author: dnhatn

core/src/main/java/org/elasticsearch/index/store/Store.java

@@ -352,24 +352,12 @@ public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
      * @param out where infoStream messages should go. See {@link CheckIndex#setInfoStream(PrintStream)}
      */
     public CheckIndex.Status checkIndex(PrintStream out) throws IOException {
-        // We don't need to lock the directory here as we are not changing the index files.
-        final Lock noDirectoryLock = new Lock() {
-            @Override
-            public void close() throws IOException {
-
-            }
-
-            @Override
-            public void ensureValid() throws IOException {
-
-            }
-        };
-        metadataLock.readLock().lock();
-        try (CheckIndex checkIndex = new CheckIndex(directory, noDirectoryLock)) {
+        metadataLock.writeLock().lock();
+        try (CheckIndex checkIndex = new CheckIndex(directory)) {
             checkIndex.setInfoStream(out);
             return checkIndex.checkIndex();
         } finally {
-            metadataLock.readLock().unlock();
+            metadataLock.writeLock().unlock();
         }
     }
 

core/src/test/java/org/elasticsearch/index/store/StoreTests.java

@@ -25,7 +25,6 @@
 import org.apache.lucene.document.SortedDocValuesField;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CheckIndex;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexFileNames;
@@ -47,8 +46,6 @@
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.Lock;
-import org.apache.lucene.store.LockObtainFailedException;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IOUtils;
@@ -57,7 +54,6 @@
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.UUIDs;
-import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.InputStreamStreamInput;
 import org.elasticsearch.common.io.stream.OutputStreamStreamOutput;
 import org.elasticsearch.common.lucene.Lucene;
@@ -79,8 +75,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -1077,32 +1071,4 @@ public Directory newDirectory() throws IOException {
         store.close();
     }
 
-    public void testCheckIndex() throws Exception {
-        final ShardId shardId = new ShardId("index", "_na_", 1);
-        final Store store = new Store(shardId, INDEX_SETTINGS, new LuceneManagedDirectoryService(random()), new DummyShardLock(shardId));
-        try (IndexWriter writer = new IndexWriter(store.directory(), newIndexWriterConfig())) {
-            writer.commit();
-        }
-        // Check index does not need to lock the store directory
-        try (Lock directoryLock = store.directory().obtainLock(IndexWriter.WRITE_LOCK_NAME)) {
-            BytesStreamOutput os = new BytesStreamOutput();
-            PrintStream out = new PrintStream(os, false, StandardCharsets.UTF_8.name());
-            assertThat(store.checkIndex(out).clean, equalTo(true));
-        }
-        // exorciseIndex requires directory lock
-        try (Lock directoryLock = store.directory().obtainLock(IndexWriter.WRITE_LOCK_NAME)) {
-            BytesStreamOutput os = new BytesStreamOutput();
-            PrintStream out = new PrintStream(os, false, StandardCharsets.UTF_8.name());
-            assertThat(store.checkIndex(out).clean, equalTo(true));
-            final CheckIndex.Status status = store.checkIndex(out);
-            try {
-                store.exorciseIndex(status);
-                fail("exorciseIndex should acquire directory lock");
-            } catch (LockObtainFailedException ignore) {
-
-            }
-        }
-        store.close();
-    }
-
 }