Await GREEN status in IndexCreatingDatabaseOperation (#2890)

The IndexCreatingDatabaseOperation now waits for the ES cluster health state to be green (for max. 15 seconds) before it runs any operation. Closes #2888 * Ensure to have only 1 shard and 0 replicas in SearchesTest
Graylog2 · Sep 26, 2016 · 430518c · 430518c
1 parent 0fab9b1
commit 430518c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...2-server/src/test/java/org/graylog2/indexer/nosqlunit/IndexCreatingDatabaseOperation.java b/...2-server/src/test/java/org/graylog2/indexer/nosqlunit/IndexCreatingDatabaseOperation.java
@@ -22,6 +22,7 @@
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.IndicesAdminClient;
+import org.elasticsearch.common.unit.TimeValue;
 import org.graylog2.audit.NullAuditEventSender;
 import org.graylog2.configuration.ElasticsearchConfiguration;
 import org.graylog2.indexer.IndexMapping;
@@ -49,6 +50,7 @@ public IndexCreatingDatabaseOperation(DatabaseOperation<Client> databaseOperatio
 
     @Override
     public void insert(InputStream dataScript) {
+        waitForGreenStatus();
         final IndicesAdminClient indicesAdminClient = client.admin().indices();
         for (String index : indexes) {
             final IndicesExistsResponse indicesExistsResponse = indicesAdminClient.prepareExists(index)
@@ -72,9 +74,17 @@ public void insert(InputStream dataScript) {
 
     @Override
     public void deleteAll() {
+        waitForGreenStatus();
         databaseOperation.deleteAll();
     }
 
+    private void waitForGreenStatus() {
+        client.admin().cluster().prepareHealth()
+                .setTimeout(TimeValue.timeValueSeconds(15L))
+                .setWaitForGreenStatus()
+                .get();
+    }
+
     @Override
     public boolean databaseIs(InputStream expectedData) {
         return databaseOperation.databaseIs(expectedData);

diff --git a/graylog2-server/src/test/java/org/graylog2/indexer/searches/SearchesTest.java b/graylog2-server/src/test/java/org/graylog2/indexer/searches/SearchesTest.java
@@ -106,6 +106,16 @@ public DateTime begin() {
         public String getIndexPrefix() {
             return "graylog";
         }
+
+        @Override
+        public int getShards() {
+            return 1;
+        }
+
+        @Override
+        public int getReplicas() {
+            return 0;
+        }
     };
 
     @Mock