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

Removed wrong assertion that makes recoverWhileUnderLoadWithNodeShutdown fail. 

As we are within an awaitBusy block, it doesn't make sense to have an assertion, since it would fail the test instead of waiting till the condition is verified (till timeout expires)
This commit is contained in:
Luca Cavanna 2013-09-13 15:18:18 +02:00
parent ea00e39ff1
commit bb0baa20fb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java
View File

@ -122,7 +122,7 @@ public class RecoveryWhileUnderLoadTests extends AbstractSharedClusterTest {
logger.info("--> indexing threads stopped");
logger.info("--> refreshing the index");
refreshAndAssert(10);
refreshAndAssert();
logger.info("--> verifying indexed content");
iterateAssertCount(5, indexCounter.get(), 10);
}
@ -196,7 +196,7 @@ public class RecoveryWhileUnderLoadTests extends AbstractSharedClusterTest {
logger.info("--> indexing threads stopped");
logger.info("--> refreshing the index");
refreshAndAssert(10);
refreshAndAssert();
logger.info("--> verifying indexed content");
iterateAssertCount(5, indexCounter.get(), 10);
}
@ -287,7 +287,7 @@ public class RecoveryWhileUnderLoadTests extends AbstractSharedClusterTest {
assertThat(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("1m").setWaitForYellowStatus().setWaitForNodes(">=1").execute().actionGet().isTimedOut(), equalTo(false));
logger.info("--> refreshing the index");
refreshAndAssert(10);
refreshAndAssert();
logger.info("--> verifying indexed content");
iterateAssertCount(5, indexCounter.get(), 10);
@ -331,13 +331,12 @@ public class RecoveryWhileUnderLoadTests extends AbstractSharedClusterTest {
logger.info("iteration [{}] - returned documents: {} (expected {})", iteration, countResponse.getCount(), numberOfDocs);
}
private void refreshAndAssert(final int numberOfShards) throws InterruptedException {
private void refreshAndAssert() throws InterruptedException {
assertThat(awaitBusy(new Predicate<Object>() {
public boolean apply(Object o) {
try {
RefreshResponse actionGet = client().admin().indices().prepareRefresh().execute().actionGet();
assertNoFailures(actionGet);
assertThat(actionGet.getSuccessfulShards(), equalTo(numberOfShards));
return actionGet.getTotalShards() == actionGet.getSuccessfulShards();
} catch (Throwable e) {
throw new RuntimeException(e);