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

Fix race condition in adding TimeoutClusterStateListener 

Fixes #2658
This commit is contained in:
Igor Motov 2013-02-16 16:44:33 -05:00
parent 435eabd4a0
commit 512585da82
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
View File

@ -189,19 +189,19 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
localNodeMasterListeners.remove(listener); localNodeMasterListeners.remove(listener);
} }
public void add(TimeValue timeout, final TimeoutClusterStateListener listener) { public void add(final TimeValue timeout, final TimeoutClusterStateListener listener) {
if (lifecycle.stoppedOrClosed()) { if (lifecycle.stoppedOrClosed()) {
listener.onClose(); listener.onClose();
return; return;
} }
NotifyTimeout notifyTimeout = new NotifyTimeout(listener, timeout);
notifyTimeout.future = threadPool.schedule(timeout, ThreadPool.Names.GENERIC, notifyTimeout);
onGoingTimeouts.add(notifyTimeout);
clusterStateListeners.add(listener);
// call the post added notification on the same event thread // call the post added notification on the same event thread
updateTasksExecutor.execute(new Runnable() { updateTasksExecutor.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
NotifyTimeout notifyTimeout = new NotifyTimeout(listener, timeout);
notifyTimeout.future = threadPool.schedule(timeout, ThreadPool.Names.GENERIC, notifyTimeout);
onGoingTimeouts.add(notifyTimeout);
clusterStateListeners.add(listener);
listener.postAdded(); listener.postAdded();
} }
}); });