TESTS: Fix Race Condition in Temp Path Creation (elastic#33352)

* TESTS: Fix Race Condition in Temp Path Creation * Calling `createTempDir` concurrently here in the `Follower`s causes collisions at times which lead to `createEngine` throwing because of unexpected files in the newly created temp dir * Fixed by creating all temp dirs in the main test thread * closes elastic#33344
original-brownbear · Sep 4, 2018 · f0d402f · f0d402f
1 parent bc22d07
commit f0d402f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java b/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.index.engine;
 
+import java.nio.file.Path;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.internal.io.IOUtils;
 import org.elasticsearch.index.IndexSettings;
@@ -191,13 +192,12 @@ public void testDedupByPrimaryTerm() throws Exception {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33344")
     public void testUpdateAndReadChangesConcurrently() throws Exception {
         Follower[] followers = new Follower[between(1, 3)];
         CountDownLatch readyLatch = new CountDownLatch(followers.length + 1);
         AtomicBoolean isDone = new AtomicBoolean();
         for (int i = 0; i < followers.length; i++) {
-            followers[i] = new Follower(engine, isDone, readyLatch);
+            followers[i] = new Follower(engine, isDone, readyLatch, createTempDir());
             followers[i].start();
         }
         boolean onPrimary = randomBoolean();
@@ -236,13 +236,15 @@ class Follower extends Thread {
         private final TranslogHandler translogHandler;
         private final AtomicBoolean isDone;
         private final CountDownLatch readLatch;
+        private final Path translogPath;
 
-        Follower(Engine leader, AtomicBoolean isDone, CountDownLatch readLatch) {
+        Follower(Engine leader, AtomicBoolean isDone, CountDownLatch readLatch, Path translogPath) {
             this.leader = leader;
             this.isDone = isDone;
             this.readLatch = readLatch;
             this.translogHandler = new TranslogHandler(xContentRegistry(), IndexSettingsModule.newIndexSettings(shardId.getIndexName(),
                 engine.engineConfig.getIndexSettings().getSettings()));
+            this.translogPath = translogPath;
         }
 
         void pullOperations(Engine follower) throws IOException {
@@ -261,7 +263,7 @@ void pullOperations(Engine follower) throws IOException {
         @Override
         public void run() {
             try (Store store = createStore();
-                 InternalEngine follower = createEngine(store, createTempDir())) {
+                 InternalEngine follower = createEngine(store, translogPath)) {
                 readLatch.countDown();
                 readLatch.await();
                 while (isDone.get() == false ||