Ensure dir is created for file settings tests

rjernst · Oct 27, 2023 · 7496729 · 7496729
1 parent 5911496
commit 7496729
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...ternalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java b/...ternalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java
@@ -23,11 +23,14 @@
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.reservedstate.action.ReservedClusterSettingsAction;
 import org.elasticsearch.test.ESIntegTestCase;
+import org.junit.Before;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -99,6 +102,18 @@ public class FileSettingsServiceIT extends ESIntegTestCase {
              }
         }""";
 
+    private Map<Integer, Path> configDirs = new HashMap<>();
+
+    @Before
+    public void clearConfigDirs() {
+        configDirs.clear();
+    }
+
+    @Override
+    protected Path nodeConfigPath(int nodeOrdinal) {
+        return configDirs.computeIfAbsent(nodeOrdinal, k -> createTempDir());
+    }
+
     private void assertMasterNode(Client client, String node) {
         assertThat(
             client.admin().cluster().prepareState().execute().actionGet().getState().nodes().getMasterNode().getName(),

diff --git a/server/src/main/java/org/elasticsearch/common/file/AbstractFileWatchingService.java b/server/src/main/java/org/elasticsearch/common/file/AbstractFileWatchingService.java
@@ -73,6 +73,9 @@ public AbstractFileWatchingService(ClusterService clusterService, Path watchedFi
         this.watchedFileDir = watchedFile.getParent();
         this.eventListeners = new CopyOnWriteArrayList<>();
         this.active = Files.exists(watchedFileDir.getParent());
+        if (active == false) {
+            logger.warn("File watcher cannot start, grandparent directory [{}] does not exist", watchedFileDir.getParent());
+        }
     }
 
     /**