Fix Failing Assertion in SnapshotsInProgress (#37922)

* Fix assertion by workaround for `5.6` * Reenable test that tripped this assertion * Closes #31054
elastic · Jan 30, 2019 · d61e45d · d61e45d
1 parent c289fd3
commit d61e45d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java b/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java
@@ -240,8 +240,11 @@ public ShardSnapshotStatus(String nodeId, State state) {
         public ShardSnapshotStatus(String nodeId, State state, String reason) {
             this.nodeId = nodeId;
             this.state = state;
-            this.reason = reason;
             // If the state is failed we have to have a reason for this failure
+            if (state.failed() && reason == null) {
+                reason = "failed";
+            }
+            this.reason = reason;
             assert state.failed() == false || reason != null;
         }
 

diff --git a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java
@@ -2706,7 +2706,6 @@ public void testCannotCreateSnapshotsWithSameName() throws Exception {
         assertThat(createSnapshotResponse.getSnapshotInfo().snapshotId().getName(), equalTo(snapshotName));
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/31054")
     public void testGetSnapshotsRequest() throws Exception {
         final String repositoryName = "test-repo";
         final String indexName = "test-idx";