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

Test: fix test to optimize and flush in the end to try to prevent 'Delete Index failed - not acked'

This commit is contained in:
Michael McCandless 2014-10-28 18:20:30 -04:00 committed by mikemccand
parent d988302860
commit 462336c135
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
View File

@ -215,7 +215,7 @@ public class UpdateSettingsTests extends ElasticsearchIntegrationTest {
// Optimize does a waitForMerges, which we must do to make sure all in-flight (throttled) merges finish: // Optimize does a waitForMerges, which we must do to make sure all in-flight (throttled) merges finish:
logger.info("test: optimize"); logger.info("test: optimize");
client().admin().indices().prepareOptimize("test").get(); client().admin().indices().prepareOptimize("test").setWaitForMerge(true).get();
logger.info("test: optimize done"); logger.info("test: optimize done");
// Record current throttling so far // Record current throttling so far
@ -249,6 +249,13 @@ public class UpdateSettingsTests extends ElasticsearchIntegrationTest {
// No additional merge IO throttling should have happened: // No additional merge IO throttling should have happened:
assertEquals(sumThrottleTime, newSumThrottleTime); assertEquals(sumThrottleTime, newSumThrottleTime);
// Optimize & flush and wait; else we sometimes get a "Delete Index failed - not acked"
// when ElasticsearchIntegrationTest.after tries to remove indices created by the test:
// Wait for merges to finish
client().admin().indices().prepareOptimize("test").setWaitForMerge(true).get();
flush();
logger.info("test: test done"); logger.info("test: test done");
} }