From 92c292a400656bcc86faeadc82eb6dd2d43ce038 Mon Sep 17 00:00:00 2001
From: Nhat Nguyen <nhat.nguyen@elastic.co>
Date: Sun, 26 May 2019 10:15:10 -0400
Subject: [PATCH] Allocate to data-only nodes in ReopenWhileClosingIT

---
 .../indices/state/ReopenWhileClosingIT.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/server/src/test/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java b/server/src/test/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java
index 0f57f518e70cd..8cf3b76184ae4 100644
--- a/server/src/test/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java
+++ b/server/src/test/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java
@@ -28,6 +28,7 @@
 import org.elasticsearch.common.Glob;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.lease.Releasable;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.RunOnce;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
@@ -50,7 +51,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, minNumDataNodes = 2)
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST)
 public class ReopenWhileClosingIT extends ESIntegTestCase {
 
     @Override
@@ -64,8 +65,9 @@ protected int minimumNumberOfShards() {
     }
 
     public void testReopenDuringClose() throws Exception {
+        List<String> dataOnlyNodes = internalCluster().startDataOnlyNodes(randomIntBetween(2, 3));
         final String indexName = "test";
-        createIndexWithDocs(indexName);
+        createIndexWithDocs(indexName, dataOnlyNodes);
 
         ensureYellowAndNoInitializingShards(indexName);
 
@@ -84,12 +86,12 @@ public void testReopenDuringClose() throws Exception {
         assertIndexIsOpened(indexName);
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/39757")
     public void testReopenDuringCloseOnMultipleIndices() throws Exception {
+        List<String> dataOnlyNodes = internalCluster().startDataOnlyNodes(randomIntBetween(2, 3));
         final List<String> indices = new ArrayList<>();
         for (int i = 0; i < randomIntBetween(2, 10); i++) {
             indices.add("index-" + i);
-            createIndexWithDocs(indices.get(i));
+            createIndexWithDocs(indices.get(i), dataOnlyNodes);
         }
 
         ensureYellowAndNoInitializingShards(indices.toArray(Strings.EMPTY_ARRAY));
@@ -117,8 +119,9 @@ public void testReopenDuringCloseOnMultipleIndices() throws Exception {
         });
     }
 
-    private void createIndexWithDocs(final String indexName) {
-        createIndex(indexName);
+    private void createIndexWithDocs(final String indexName, final Collection<String> dataOnlyNodes) {
+        createIndex(indexName,
+            Settings.builder().put(indexSettings()).put("index.routing.allocation.include._name", String.join(",", dataOnlyNodes)).build());
         final int nbDocs =  scaledRandomIntBetween(1, 100);
         for (int i = 0; i < nbDocs; i++) {
             index(indexName, "_doc", String.valueOf(i), "num", i);