honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 06:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

nicer code

Browse Source
This commit is contained in:
kimchy 2010-06-15 23:14:04 +03:00
parent eaf124123d
commit 8e589b5a04
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/fd/NodesFaultDetection.java
View File

@ -194,32 +194,34 @@ public class NodesFaultDetection extends AbstractComponent {
}
@Override public void handleResponse(PingResponse response) {
if (running) {
NodeFD nodeFD = nodesFD.get(node);
if (nodeFD != null) {
nodeFD.retryCount = 0;
threadPool.schedule(SendPingRequest.this, pingInterval);
}
if (!running) {
return;
}
NodeFD nodeFD = nodesFD.get(node);
if (nodeFD != null) {
nodeFD.retryCount = 0;
threadPool.schedule(SendPingRequest.this, pingInterval);
}
}
@Override public void handleException(RemoteTransportException exp) {
// check if the master node did not get switched on us...
if (running) {
NodeFD nodeFD = nodesFD.get(node);
if (nodeFD != null) {
int retryCount = ++nodeFD.retryCount;
logger.trace("Node [{}] failed to ping, retry [{}] out of [{}]", exp, node, retryCount, pingRetryCount);
if (retryCount >= pingRetryCount) {
logger.debug("Node [{}] failed on ping, tried [{}] times, each with [{}] timeout", node, pingRetryCount, pingRetryTimeout);
// not good, failure
if (nodesFD.remove(node) != null) {
notifyNodeFailure(node, "Failed on ping, tried [" + pingRetryCount + "] times, each with [" + pingRetryTimeout + "] timeout");
}
} else {
// resend the request, not reschedule, rely on send timeout
transportService.sendRequest(node, PingRequestHandler.ACTION, new PingRequest(node.id()), pingRetryTimeout, this);
if (!running) {
return;
}
NodeFD nodeFD = nodesFD.get(node);
if (nodeFD != null) {
int retryCount = ++nodeFD.retryCount;
logger.trace("Node [{}] failed to ping, retry [{}] out of [{}]", exp, node, retryCount, pingRetryCount);
if (retryCount >= pingRetryCount) {
logger.debug("Node [{}] failed on ping, tried [{}] times, each with [{}] timeout", node, pingRetryCount, pingRetryTimeout);
// not good, failure
if (nodesFD.remove(node) != null) {
notifyNodeFailure(node, "Failed on ping, tried [" + pingRetryCount + "] times, each with [" + pingRetryTimeout + "] timeout");
}
} else {
// resend the request, not reschedule, rely on send timeout
transportService.sendRequest(node, PingRequestHandler.ACTION, new PingRequest(node.id()), pingRetryTimeout, this);
}
}
}