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

Increase assertBusy timeouts for RefreshListenersTests

This commit is contained in:
Yannick Welsch 2019-01-11 10:15:39 +01:00
parent 82ca2d62de
commit 3a929c7aea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java
View File

@ -72,6 +72,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -264,7 +265,6 @@ public class RefreshListenersTests extends ESTestCase {
* adding listeners. This can catch the situation where a refresh happens right as the listener is being added such that the listener * adding listeners. This can catch the situation where a refresh happens right as the listener is being added such that the listener
* misses the refresh and has to catch the next one. If the listener wasn't able to properly catch the next one then this would fail. * misses the refresh and has to catch the next one. If the listener wasn't able to properly catch the next one then this would fail.
*/ */
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/37261")
public void testConcurrentRefresh() throws Exception { public void testConcurrentRefresh() throws Exception {
AtomicBoolean run = new AtomicBoolean(true); AtomicBoolean run = new AtomicBoolean(true);
Thread refresher = new Thread(() -> { Thread refresher = new Thread(() -> {
@ -281,7 +281,7 @@ public class RefreshListenersTests extends ESTestCase {
if (immediate) { if (immediate) {
assertNotNull(listener.forcedRefresh.get()); assertNotNull(listener.forcedRefresh.get());
} else { } else {
assertBusy(() -> assertNotNull(listener.forcedRefresh.get())); assertBusy(() -> assertNotNull(listener.forcedRefresh.get()), 1, TimeUnit.MINUTES);
} }
assertFalse(listener.forcedRefresh.get()); assertFalse(listener.forcedRefresh.get());
listener.assertNoError(); listener.assertNoError();
@ -316,7 +316,7 @@ public class RefreshListenersTests extends ESTestCase {
DummyRefreshListener listener = new DummyRefreshListener(); DummyRefreshListener listener = new DummyRefreshListener();
listeners.addOrNotify(index.getTranslogLocation(), listener); listeners.addOrNotify(index.getTranslogLocation(), listener);
assertBusy(() -> assertNotNull("listener never called", listener.forcedRefresh.get())); assertBusy(() -> assertNotNull("listener never called", listener.forcedRefresh.get()), 1, TimeUnit.MINUTES);
if (threadCount < maxListeners) { if (threadCount < maxListeners) {
assertFalse(listener.forcedRefresh.get()); assertFalse(listener.forcedRefresh.get());
} }