Revert "Make NodeEnvironment.resolveIndexFolder singular (#72515)" (#…

…78702) This reverts commit 7a05d72. The revert had no merge conflicts. relates #78525 relates #71205
elastic · Oct 6, 2021 · c100829 · c100829
1 parent ddc1a0d
commit c100829
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 22 deletions.
diff --git a/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java
@@ -1022,12 +1022,19 @@ public Set<String> availableIndexFoldersForPath(final NodePath nodePath, Predica
     /**
      * Resolves all existing paths to <code>indexFolderName</code> in ${data.paths}/indices
      */
-    public Path resolveIndexFolder(String indexFolderName) {
+    public Path[] resolveIndexFolder(String indexFolderName) {
         if (nodePaths == null || locks == null) {
             throw new IllegalStateException("node is not configured to store local location");
         }
         assertEnvIsLocked();
-        return nodePaths[0].indicesPath.resolve(indexFolderName);
+        List<Path> paths = new ArrayList<>(nodePaths.length);
+        for (NodePath nodePath : nodePaths) {
+            Path indexFolder = nodePath.indicesPath.resolve(indexFolderName);
+            if (Files.exists(indexFolder)) {
+                paths.add(indexFolder);
+            }
+        }
+        return paths.toArray(new Path[paths.size()]);
     }
 
     /**
@@ -1290,22 +1297,22 @@ public static Path shardStatePathToDataPath(Path shardPath) {
     private void assertCanWrite() throws IOException {
         tryWriteTempFile(nodeDataPath());
         for (String indexFolderName : this.availableIndexFolders()) {
-            // check index paths are writable
-            Path indexPath = this.resolveIndexFolder(indexFolderName);
-            Path indexStatePath = indexPath.resolve(MetadataStateFormat.STATE_DIR_NAME);
-            tryWriteTempFile(indexStatePath);
-            tryWriteTempFile(indexPath);
-            try (DirectoryStream<Path> stream = Files.newDirectoryStream(indexPath)) {
-                for (Path shardPath : stream) {
-                    String fileName = shardPath.getFileName().toString();
-                    if (Files.isDirectory(shardPath) && fileName.chars().allMatch(Character::isDigit)) {
-                        Path indexDir = shardPath.resolve(ShardPath.INDEX_FOLDER_NAME);
-                        Path statePath = shardPath.resolve(MetadataStateFormat.STATE_DIR_NAME);
-                        Path translogDir = shardPath.resolve(ShardPath.TRANSLOG_FOLDER_NAME);
-                        tryWriteTempFile(indexDir);
-                        tryWriteTempFile(translogDir);
-                        tryWriteTempFile(statePath);
-                        tryWriteTempFile(shardPath);
+            for (Path indexPath : this.resolveIndexFolder(indexFolderName)) { // check index paths are writable
+                Path indexStatePath = indexPath.resolve(MetadataStateFormat.STATE_DIR_NAME);
+                tryWriteTempFile(indexStatePath);
+                tryWriteTempFile(indexPath);
+                try (DirectoryStream<Path> stream = Files.newDirectoryStream(indexPath)) {
+                    for (Path shardPath : stream) {
+                        String fileName = shardPath.getFileName().toString();
+                        if (Files.isDirectory(shardPath) && fileName.chars().allMatch(Character::isDigit)) {
+                            Path indexDir = shardPath.resolve(ShardPath.INDEX_FOLDER_NAME);
+                            Path statePath = shardPath.resolve(MetadataStateFormat.STATE_DIR_NAME);
+                            Path translogDir = shardPath.resolve(ShardPath.TRANSLOG_FOLDER_NAME);
+                            tryWriteTempFile(indexDir);
+                            tryWriteTempFile(translogDir);
+                            tryWriteTempFile(statePath);
+                            tryWriteTempFile(shardPath);
+                        }
                     }
                 }
             }

diff --git a/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
@@ -182,7 +182,8 @@ public void testResolveIndexFolders() throws Exception {
         }
         for (Map.Entry<String, List<Path>> actualIndexDataPathEntry : actualIndexDataPaths.entrySet()) {
             List<Path> actual = actualIndexDataPathEntry.getValue();
-            assertThat(actual.get(0), equalTo(env.resolveIndexFolder(actualIndexDataPathEntry.getKey())));
+            Path[] actualPaths = actual.toArray(new Path[actual.size()]);
+            assertThat(actualPaths, equalTo(env.resolveIndexFolder(actualIndexDataPathEntry.getKey())));
         }
         assertTrue("LockedShards: " + env.lockedShards(), env.lockedShards().isEmpty());
         env.close();

diff --git a/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java b/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java
@@ -69,9 +69,10 @@ public void testInvalidIndexFolder() throws Exception {
             final Settings.Builder settings = Settings.builder().put(indexSettings).put(IndexMetadata.SETTING_INDEX_UUID, uuid);
             IndexMetadata dangledIndex = IndexMetadata.builder("test1").settings(settings).build();
             metaStateService.writeIndex("test_write", dangledIndex);
-            Path path = env.resolveIndexFolder(uuid);
-            if (Files.exists(path)) {
-                Files.move(path, path.resolveSibling("invalidUUID"), StandardCopyOption.ATOMIC_MOVE);
+            for (Path path : env.resolveIndexFolder(uuid)) {
+                if (Files.exists(path)) {
+                    Files.move(path, path.resolveSibling("invalidUUID"), StandardCopyOption.ATOMIC_MOVE);
+                }
             }
 
             final IllegalStateException e = expectThrows(IllegalStateException.class, danglingState::getDanglingIndices);