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

Ensure no scheduled refresh in testPendingRefreshWithIntervalChange 

If a refresh, which is scheduled by the setting change, executes after
the index-2 operation and win the refresh race (i.e., maybeRefresh) with
the scheduledRefresh that we are going to check, then the latter will
return false.

Closes #39565
Relates #39462

PR #40387
This commit is contained in:
Nhat Nguyen 2019-03-27 01:23:35 -04:00
parent 11f2da9d5e
commit e716b9ceee
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java
View File

@ -82,6 +82,8 @@ import org.elasticsearch.test.ESSingleNodeTestCase;
import org.elasticsearch.test.IndexSettingsModule;
import org.elasticsearch.test.InternalSettingsPlugin;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.threadpool.ThreadPoolStats;
import java.io.IOException;
import java.io.UncheckedIOException;
@ -738,8 +740,7 @@ public class IndexShardIT extends ESSingleNodeTestCase {
t.join();
}
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/39565")
public void testPendingRefreshWithIntervalChange() throws InterruptedException {
public void testPendingRefreshWithIntervalChange() throws Exception {
Settings.Builder builder = Settings.builder();
builder.put(IndexSettings.INDEX_SEARCH_IDLE_AFTER.getKey(), TimeValue.ZERO);
IndexService indexService = createIndex("test", builder.build());
@ -767,7 +768,14 @@ public class IndexShardIT extends ESSingleNodeTestCase {
// wait for both to ensure we don't have in-flight operations
updateSettingsLatch.await();
refreshLatch.await();
// ensure no scheduled refresh to compete with the scheduleRefresh we are going to verify.
assertBusy(() -> {
for (ThreadPoolStats.Stats stat : indexService.getThreadPool().stats()) {
if (stat.getName().equals(ThreadPool.Names.REFRESH) && (stat.getQueue() > 0 || stat.getActive() > 0)) {
throw new AssertionError(); // cause assert busy to retry
}
}
});
client().prepareIndex("test", "test", "2").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get();
assertTrue(shard.scheduledRefresh());
assertTrue(shard.isSearchIdle());