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

[TEST] Increased timeout for verifying ccr monitoring.

This commit is contained in:
Martijn van Groningen 2018-11-09 15:40:15 +01:00
parent fba811fa3a
commit 807ce10f73
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x-pack/plugin/ccr/qa/multi-cluster-with-security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java
View File

@ -16,6 +16,7 @@ import org.elasticsearch.common.xcontent.support.XContentMapValues;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue; import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
@ -63,7 +64,7 @@ public class FollowIndexSecurityIT extends ESCCRRestTestCase {
followIndex(client(), "leader_cluster", allowedIndex, allowedIndex); followIndex(client(), "leader_cluster", allowedIndex, allowedIndex);
assertBusy(() -> verifyDocuments(allowedIndex, numDocs, "*:*")); assertBusy(() -> verifyDocuments(allowedIndex, numDocs, "*:*"));
assertThat(countCcrNodeTasks(), equalTo(1)); assertThat(countCcrNodeTasks(), equalTo(1));
assertBusy(() -> verifyCcrMonitoring(allowedIndex, allowedIndex)); assertBusy(() -> verifyCcrMonitoring(allowedIndex, allowedIndex), 30, TimeUnit.SECONDS);
assertOK(client().performRequest(new Request("POST", "/" + allowedIndex + "/_ccr/pause_follow"))); assertOK(client().performRequest(new Request("POST", "/" + allowedIndex + "/_ccr/pause_follow")));
// Make sure that there are no other ccr relates operations running: // Make sure that there are no other ccr relates operations running:
assertBusy(() -> { assertBusy(() -> {
@ -167,7 +168,7 @@ public class FollowIndexSecurityIT extends ESCCRRestTestCase {
assertBusy(() -> { assertBusy(() -> {
verifyCcrMonitoring(allowedIndex, allowedIndex); verifyCcrMonitoring(allowedIndex, allowedIndex);
verifyAutoFollowMonitoring(); verifyAutoFollowMonitoring();
}); }, 30, TimeUnit.SECONDS);
// Cleanup by deleting auto follow pattern and pause following: // Cleanup by deleting auto follow pattern and pause following:
request = new Request("DELETE", "/_ccr/auto_follow/test_pattern"); request = new Request("DELETE", "/_ccr/auto_follow/test_pattern");

5
x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java
View File

@ -12,6 +12,7 @@ import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
@ -58,7 +59,7 @@ public class FollowIndexIT extends ESCCRRestTestCase {
index(leaderClient, leaderIndexName, Integer.toString(id + 2), "field", id + 2, "filtered_field", "true"); index(leaderClient, leaderIndexName, Integer.toString(id + 2), "field", id + 2, "filtered_field", "true");
} }
assertBusy(() -> verifyDocuments(followIndexName, numDocs + 3, "filtered_field:true")); assertBusy(() -> verifyDocuments(followIndexName, numDocs + 3, "filtered_field:true"));
assertBusy(() -> verifyCcrMonitoring(leaderIndexName, followIndexName)); assertBusy(() -> verifyCcrMonitoring(leaderIndexName, followIndexName), 30, TimeUnit.SECONDS);
pauseFollow(followIndexName); pauseFollow(followIndexName);
assertOK(client().performRequest(new Request("POST", "/" + followIndexName + "/_close"))); assertOK(client().performRequest(new Request("POST", "/" + followIndexName + "/_close")));
@ -113,7 +114,7 @@ public class FollowIndexIT extends ESCCRRestTestCase {
assertBusy(() -> { assertBusy(() -> {
verifyCcrMonitoring("logs-20190101", "logs-20190101"); verifyCcrMonitoring("logs-20190101", "logs-20190101");
verifyAutoFollowMonitoring(); verifyAutoFollowMonitoring();
}); }, 30, TimeUnit.SECONDS);
} }
} }