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

Fix SLMSnapshotBlockingIntegTests.testSnapshotInProgress (#59218) (#59239) 

Waiting `INIT` here is dead code in newer versions that don't use `INIT`
any longer and leads to nothing being written to the repository in older versions
if the snapshot is cancelled at the `INIT` step which then breaks repo consistency
checks.
Since we have other tests ensuring that snapshot abort works properly we can just remove
the wait for `INIT` here and backport this down to 7.8 to fix tests.

relates #59140
This commit is contained in:
Armin Braun 2020-07-08 19:13:01 +02:00 committed by GitHub
parent 838f717e5f
commit cc3c8be0f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java
View File

@ -144,8 +144,8 @@ public class SLMSnapshotBlockingIntegTests extends AbstractSnapshotIntegTestCase
SnapshotLifecyclePolicyItem.SnapshotInProgress inProgress = item.getSnapshotInProgress(); SnapshotLifecyclePolicyItem.SnapshotInProgress inProgress = item.getSnapshotInProgress();
assertThat(inProgress.getSnapshotId().getName(), equalTo(snapshotName)); assertThat(inProgress.getSnapshotId().getName(), equalTo(snapshotName));
assertThat(inProgress.getStartTime(), greaterThan(0L)); assertThat(inProgress.getStartTime(), greaterThan(0L));
assertThat(inProgress.getState(), anyOf(equalTo(SnapshotsInProgress.State.INIT), equalTo(SnapshotsInProgress.State.STARTED), assertThat(inProgress.getState(),
equalTo(SnapshotsInProgress.State.SUCCESS))); anyOf(equalTo(SnapshotsInProgress.State.STARTED), equalTo(SnapshotsInProgress.State.SUCCESS)));
assertNull(inProgress.getFailure()); assertNull(inProgress.getFailure());
}); });