Skip to content

Commit

Permalink
[7.5] Mute FullClusterRestartTest#testWatcher and 30s timeout… (#48851)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jakelandis authored Nov 11, 2019
1 parent 12a618c commit b810048
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,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());
Expand Down Expand Up @@ -602,7 +603,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");
if (getOldClusterVersion().onOrAfter(Version.V_6_2_0)) {
request.addParameter("wait_for_no_initializing_shards", "true");
Expand Down

0 comments on commit b810048

Please sign in to comment.