From c7d7a2bafc26036dee757f63b105d756e202115e Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Fri, 25 Nov 2016 12:53:36 +0100 Subject: [PATCH] [TEST] Wait in rolling_upgrade rest test for monitoring indices to be fully allocated Fixes previous commit elastic/x-pack@8bb4e6a so that it also accounts for monitoring indices that are automatically created by x-pack while the test is running. Original commit: elastic/x-pack-elasticsearch@e50e1a2717c88b83338f3a8e618212bda5f1eb4e --- .../resources/rest-api-spec/test/old_cluster/10_basic.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml index 04ac04bc5aa..4791bb29061 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml @@ -3,6 +3,7 @@ - do: indices.create: index: test_index + wait_for_active_shards : all body: settings: index: @@ -35,6 +36,6 @@ - do: cluster.health: - wait_for_status: green - wait_for_nodes: 2 - timeout: 25s + index: ".monitoring-*" # include monitoring-data-* and monitoring-es-* + wait_for_active_shards: 4 # 1 primary and 1 replica each for the two monitoring indices + timeout: 25s