From c24be730a0cea1ccfe636dc40ab950efae81de44 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 4 Nov 2019 10:35:35 -0600 Subject: [PATCH] Mute FullClusterRestartTest#testWatcher and bring back 30s timeout for yellow The timeout was increased to 60s to allow this test more time to reach a yellow state. However, the test will still on occasion fail even with the 60s timeout. Related: #48381 Related: #48434 Related: #47950 Related: #40178 --- .../org/elasticsearch/xpack/restart/FullClusterRestartIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java b/x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java index a7a378d0a1549..ecb98d4d346eb 100644 --- a/x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java +++ b/x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java @@ -123,6 +123,7 @@ public void testSecurityNativeRealm() throws Exception { } @SuppressWarnings("unchecked") + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/48381") public void testWatcher() throws Exception { if (isRunningAgainstOldCluster()) { logger.info("Adding a watch on old cluster {}", getOldClusterVersion()); @@ -415,7 +416,7 @@ private void assertBasicWatchInteractions() throws Exception { private void waitForYellow(String indexName) throws IOException { Request request = new Request("GET", "/_cluster/health/" + indexName); request.addParameter("wait_for_status", "yellow"); - request.addParameter("timeout", "60s"); + request.addParameter("timeout", "30s"); request.addParameter("wait_for_no_relocating_shards", "true"); request.addParameter("wait_for_no_initializing_shards", "true"); Map response = entityAsMap(client().performRequest(request));