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

SNAPSHOT+TESTS: Relax Assertion in DisruptionIT (#37144) 

* The retries on the failing master can lead to concurrently trying to create and delete a snapshot, catch this for now to fix this test
* closes #36779
This commit is contained in:
Armin Braun 2019-01-05 17:52:24 +01:00 committed by GitHub
parent 0cc877026f
commit b34e7d4f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java
View File

@ -34,6 +34,7 @@ import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.snapshots.ConcurrentSnapshotExecutionException;
import org.elasticsearch.snapshots.SnapshotInfo;
import org.elasticsearch.snapshots.SnapshotMissingException;
import org.elasticsearch.snapshots.SnapshotState;
@ -165,11 +166,15 @@ public class SnapshotDisruptionIT extends ESIntegTestCase {
try {
future.get();
} catch (Exception ex) {
logger.info("--> got exception from hanged master", ex);
Throwable cause = ex.getCause();
assertThat(cause, instanceOf(MasterNotDiscoveredException.class));
cause = cause.getCause();
assertThat(cause, instanceOf(FailedToCommitClusterStateException.class));
if (cause.getCause() instanceof ConcurrentSnapshotExecutionException) {
logger.info("--> got exception from race in master operation retries");
} else {
logger.info("--> got exception from hanged master", ex);
assertThat(cause, instanceOf(MasterNotDiscoveredException.class));
cause = cause.getCause();
assertThat(cause, instanceOf(FailedToCommitClusterStateException.class));
}
}
logger.info("--> verify that snapshot eventually will be created due to retries");