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

better safeguard for concurrent restart requests

This commit is contained in:
kimchy 2010-05-14 10:28:18 +03:00
parent b49864299d
commit 10754b0873
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/TransportNodesRestartAction.java
View File

@ -38,6 +38,7 @@ import org.elasticsearch.util.settings.Settings;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.concurrent.atomic.AtomicReferenceArray;
import static org.elasticsearch.util.TimeValue.*; import static org.elasticsearch.util.TimeValue.*;
@ -52,7 +53,7 @@ public class TransportNodesRestartAction extends TransportNodesOperationAction<N
private final boolean disabled; private final boolean disabled;
private volatile boolean restartRequested = false; private AtomicBoolean restartRequested = new AtomicBoolean();
@Inject public TransportNodesRestartAction(Settings settings, ClusterName clusterName, ThreadPool threadPool, @Inject public TransportNodesRestartAction(Settings settings, ClusterName clusterName, ThreadPool threadPool,
ClusterService clusterService, TransportService transportService, ClusterService clusterService, TransportService transportService,
@ -101,10 +102,9 @@ public class TransportNodesRestartAction extends TransportNodesOperationAction<N
if (disabled) { if (disabled) {
throw new ElasticSearchIllegalStateException("Restart is disabled"); throw new ElasticSearchIllegalStateException("Restart is disabled");
} }
if (restartRequested) { if (!restartRequested.compareAndSet(false, true)) {
return new NodesRestartResponse.NodeRestartResponse(clusterService.state().nodes().localNode()); return new NodesRestartResponse.NodeRestartResponse(clusterService.state().nodes().localNode());
} }
restartRequested = true;
logger.info("Restarting in [{}]", request.delay); logger.info("Restarting in [{}]", request.delay);
threadPool.schedule(new Runnable() { threadPool.schedule(new Runnable() {
@Override public void run() { @Override public void run() {
@ -127,7 +127,7 @@ public class TransportNodesRestartAction extends TransportNodesOperationAction<N
} catch (Exception e) { } catch (Exception e) {
logger.warn("Failed to restart", e); logger.warn("Failed to restart", e);
} finally { } finally {
restartRequested = false; restartRequested.set(false);
} }
} }
} }