honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enable FullClusterRestartIT#testWatcher test (#50463) 

Previously this test failed waiting for yellow:
https://gradle-enterprise.elastic.co/s/fv55holsa36tg/console-log#L2676

Oddly cluster health returned red status, but there were no unassigned, relocating or initializing shards.
Placed the waiting for green in a try-catch block, so that when this fails again then cluster state gets printed.

Relates to #48381
This commit is contained in:
Martijn van Groningen 2020-01-06 10:47:52 +01:00
parent 53ac28e398
commit d3078c5b40
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java
View File

@ -146,7 +146,6 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
}
@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());
@ -169,13 +168,25 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
client().performRequest(createFunnyTimeout);
logger.info("Waiting for watch results index to fill up...");
waitForYellow(".watches,bwc_watch_index,.watcher-history*");
try {
waitForYellow(".watches,bwc_watch_index,.watcher-history*");
} catch (ResponseException e) {
String rsp = toStr(client().performRequest(new Request("GET", "/_cluster/state")));
logger.info("cluster_state_response=\n{}", rsp);
throw e;
}
waitForHits("bwc_watch_index", 2);
waitForHits(".watcher-history*", 2);
logger.info("Done creating watcher-related indices");
} else {
logger.info("testing against {}", getOldClusterVersion());
waitForYellow(".watches,bwc_watch_index,.watcher-history*");
try {
waitForYellow(".watches,bwc_watch_index,.watcher-history*");
} catch (ResponseException e) {
String rsp = toStr(client().performRequest(new Request("GET", "/_cluster/state")));
logger.info("cluster_state_response=\n{}", rsp);
throw e;
}
logger.info("checking that the Watches index is the correct version");