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

[7.x] Use separate policies for tests in SnapshotLifecycleRest… (#51181) 

These policies store statistics, but since stats updating is asynchronous, it's
possible for the update from one test to bleed into a separate one. This change
switches the tests to use separate policy ids so that their stats are tracked
independently. It also relaxes the checking constraint in one of the tests.

Hopefully this:
Resolves #48531
Resolves #48017
This commit is contained in:
Lee Hinman 2020-01-17 13:26:40 -07:00 committed by GitHub
parent 83c92cf7eb
commit 731c96b507
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleRestIT.java
View File

@ -66,10 +66,10 @@ public class SnapshotLifecycleRestIT extends ESRestTestCase {
} }
public void testMissingRepo() throws Exception { public void testMissingRepo() throws Exception {
SnapshotLifecyclePolicy policy = new SnapshotLifecyclePolicy("test-policy", "snap", SnapshotLifecyclePolicy policy = new SnapshotLifecyclePolicy("missing-repo-policy", "snap",
"*/1 * * * * ?", "missing-repo", Collections.emptyMap(), SnapshotRetentionConfiguration.EMPTY); "*/1 * * * * ?", "missing-repo", Collections.emptyMap(), SnapshotRetentionConfiguration.EMPTY);
Request putLifecycle = new Request("PUT", "/_slm/policy/test-policy"); Request putLifecycle = new Request("PUT", "/_slm/policy/missing-repo-policy");
XContentBuilder lifecycleBuilder = JsonXContent.contentBuilder(); XContentBuilder lifecycleBuilder = JsonXContent.contentBuilder();
policy.toXContent(lifecycleBuilder, ToXContent.EMPTY_PARAMS); policy.toXContent(lifecycleBuilder, ToXContent.EMPTY_PARAMS);
putLifecycle.setJsonEntity(Strings.toString(lifecycleBuilder)); putLifecycle.setJsonEntity(Strings.toString(lifecycleBuilder));
@ -84,7 +84,7 @@ public class SnapshotLifecycleRestIT extends ESRestTestCase {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testFullPolicySnapshot() throws Exception { public void testFullPolicySnapshot() throws Exception {
final String indexName = "test"; final String indexName = "test";
final String policyName = "test-policy"; final String policyName = "full-policy";
final String repoId = "full-policy-repo"; final String repoId = "full-policy-repo";
int docCount = randomIntBetween(10, 50); int docCount = randomIntBetween(10, 50);
List<IndexRequestBuilder> indexReqs = new ArrayList<>(); List<IndexRequestBuilder> indexReqs = new ArrayList<>();
@ -154,7 +154,7 @@ public class SnapshotLifecycleRestIT extends ESRestTestCase {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testPolicyFailure() throws Exception { public void testPolicyFailure() throws Exception {
final String policyName = "test-policy"; final String policyName = "failure-policy";
final String repoName = "policy-failure-repo"; final String repoName = "policy-failure-repo";
final String indexPattern = "index-doesnt-exist"; final String indexPattern = "index-doesnt-exist";
initializeRepo(repoName); initializeRepo(repoName);
@ -203,7 +203,7 @@ public class SnapshotLifecycleRestIT extends ESRestTestCase {
issueUrl = "https://github.com/elastic/elasticsearch/issues/48531") issueUrl = "https://github.com/elastic/elasticsearch/issues/48531")
public void testPolicyManualExecution() throws Exception { public void testPolicyManualExecution() throws Exception {
final String indexName = "test"; final String indexName = "test";
final String policyName = "test-policy"; final String policyName = "manual-policy";
final String repoId = "manual-execution-repo"; final String repoId = "manual-execution-repo";
int docCount = randomIntBetween(10, 50); int docCount = randomIntBetween(10, 50);
for (int i = 0; i < docCount; i++) { for (int i = 0; i < docCount; i++) {
@ -350,7 +350,7 @@ public class SnapshotLifecycleRestIT extends ESRestTestCase {
issueUrl = "https://github.com/elastic/elasticsearch/issues/48017") issueUrl = "https://github.com/elastic/elasticsearch/issues/48017")
public void testBasicTimeBasedRetention() throws Exception { public void testBasicTimeBasedRetention() throws Exception {
final String indexName = "test"; final String indexName = "test";
final String policyName = "test-policy"; final String policyName = "basic-time-policy";
final String repoId = "time-based-retention-repo"; final String repoId = "time-based-retention-repo";
int docCount = randomIntBetween(10, 50); int docCount = randomIntBetween(10, 50);
List<IndexRequestBuilder> indexReqs = new ArrayList<>(); List<IndexRequestBuilder> indexReqs = new ArrayList<>();
@ -421,8 +421,8 @@ public class SnapshotLifecycleRestIT extends ESRestTestCase {
int retentionRun = (int) stats.get(SnapshotLifecycleStats.RETENTION_RUNS.getPreferredName()); int retentionRun = (int) stats.get(SnapshotLifecycleStats.RETENTION_RUNS.getPreferredName());
int totalTaken = (int) stats.get(SnapshotLifecycleStats.TOTAL_TAKEN.getPreferredName()); int totalTaken = (int) stats.get(SnapshotLifecycleStats.TOTAL_TAKEN.getPreferredName());
int totalDeleted = (int) stats.get(SnapshotLifecycleStats.TOTAL_DELETIONS.getPreferredName()); int totalDeleted = (int) stats.get(SnapshotLifecycleStats.TOTAL_DELETIONS.getPreferredName());
assertThat(snapsTaken, equalTo(1)); assertThat(snapsTaken, greaterThanOrEqualTo(1));
assertThat(totalTaken, equalTo(1)); assertThat(totalTaken, greaterThanOrEqualTo(1));
assertThat(retentionRun, greaterThanOrEqualTo(1)); assertThat(retentionRun, greaterThanOrEqualTo(1));
assertThat(snapsDeleted, greaterThanOrEqualTo(1)); assertThat(snapsDeleted, greaterThanOrEqualTo(1));
assertThat(totalDeleted, greaterThanOrEqualTo(1)); assertThat(totalDeleted, greaterThanOrEqualTo(1));