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

Start the task timeout checking *after* adding it to the execution queue. 

This prevents missing very short timeouts which fire before the calling thread had the chance to add the task to the queue and are therefore ignored. This is mostly of importance for testing where we explicitly want tasks to timeout and set it to a very low value.
This commit is contained in:
Boaz Leskes 2013-12-16 10:54:09 +01:00
parent 318bce98c4
commit 6fbcd8f8ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java
View File

@ -62,6 +62,7 @@ public class PrioritizedEsThreadPoolExecutor extends EsThreadPoolExecutor {
} else if (!(command instanceof PrioritizedFutureTask)) { // it might be a callable wrapper... } else if (!(command instanceof PrioritizedFutureTask)) { // it might be a callable wrapper...
command = new TieBreakingPrioritizedRunnable(command, Priority.NORMAL, insertionOrder.incrementAndGet()); command = new TieBreakingPrioritizedRunnable(command, Priority.NORMAL, insertionOrder.incrementAndGet());
} }
super.execute(command);
if (timeout.nanos() >= 0) { if (timeout.nanos() >= 0) {
final Runnable fCommand = command; final Runnable fCommand = command;
timer.schedule(new Runnable() { timer.schedule(new Runnable() {
@ -74,7 +75,6 @@ public class PrioritizedEsThreadPoolExecutor extends EsThreadPoolExecutor {
} }
}, timeout.nanos(), TimeUnit.NANOSECONDS); }, timeout.nanos(), TimeUnit.NANOSECONDS);
} }
super.execute(command);
} }
@Override @Override

4
src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java
View File

@ -83,7 +83,7 @@ public class ClusterServiceTests extends ElasticsearchIntegrationTest {
clusterService1.submitStateUpdateTask("test2", new TimeoutClusterStateUpdateTask() { clusterService1.submitStateUpdateTask("test2", new TimeoutClusterStateUpdateTask() {
@Override @Override
public TimeValue timeout() { public TimeValue timeout() {
return TimeValue.timeValueMillis(100); return TimeValue.timeValueMillis(2);
} }
@Override @Override
@ -102,7 +102,7 @@ public class ClusterServiceTests extends ElasticsearchIntegrationTest {
} }
}); });
assertThat(timedOut.await(1000, TimeUnit.MILLISECONDS), equalTo(true)); assertThat(timedOut.await(500, TimeUnit.MILLISECONDS), equalTo(true));
block.countDown(); block.countDown();
Thread.sleep(100); // sleep a bit to double check that execute on the timed out update task is not called... Thread.sleep(100); // sleep a bit to double check that execute on the timed out update task is not called...
assertThat(executeCalled.get(), equalTo(false)); assertThat(executeCalled.get(), equalTo(false));