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

better failure messages

This commit is contained in:
kimchy 2010-06-16 21:47:58 +03:00
parent 4d26acd6da
commit a59679b0c6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
View File

@ -189,12 +189,12 @@ public class MasterFaultDetection extends AbstractComponent {
try {
transportService.connectToNode(node);
} catch (Exception e) {
logger.trace("Master [{}] failed on disconnect (with verified connect)", masterNode);
notifyMasterFailure(masterNode, "failed on disconnect (with verified connect)");
logger.trace("Master [{}] transport disconnected (with verified connect)", masterNode);
notifyMasterFailure(masterNode, "transport disconnected (with verified connect)");
}
} else {
logger.trace("Master [{}] failed on disconnect", node);
notifyMasterFailure(node, "failed on disconnect");
logger.trace("Master [{}] transport disconnected", node);
notifyMasterFailure(node, "transport disconnected");
}
}
}
@ -279,9 +279,9 @@ public class MasterFaultDetection extends AbstractComponent {
int retryCount = ++MasterFaultDetection.this.retryCount;
logger.trace("Master [{}] failed to ping, retry [{}] out of [{}]", exp, masterNode, retryCount, pingRetryCount);
if (retryCount >= pingRetryCount) {
logger.debug("Master [{}] failed on ping, tried [{}] times, each with [{}] timeout", masterNode, pingRetryCount, pingRetryTimeout);
logger.debug("Master [{}] failed to ping, tried [{}] times, each with [{}] timeout", masterNode, pingRetryCount, pingRetryTimeout);
// not good, failure
notifyMasterFailure(masterToPing, "Failed on ping, tried [" + pingRetryCount + "] times, each with [" + pingRetryTimeout + "] timeout");
notifyMasterFailure(masterToPing, "failed to ping, tried [" + pingRetryCount + "] times, each with [" + pingRetryTimeout + "] timeout");
} else {
// resend the request, not reschedule, rely on send timeout
transportService.sendRequest(masterToPing, MasterPingRequestHandler.ACTION, new MasterPingRequest(nodesProvider.nodes().localNode().id(), masterToPing.id()), pingRetryTimeout, this);

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

@ -160,12 +160,12 @@ public class NodesFaultDetection extends AbstractComponent {
try {
transportService.connectToNode(node);
} catch (Exception e) {
logger.trace("Node [{}] failed on disconnect (with verified connect)", node);
notifyNodeFailure(node, "Failed on disconnect (with verified connect)");
logger.trace("Node [{}] transport disconnected (with verified connect)", node);
notifyNodeFailure(node, "transport disconnected (with verified connect)");
}
} else {
logger.trace("Node [{}] failed on disconnect", node);
notifyNodeFailure(node, "Failed on disconnect");
logger.trace("Node [{}] transport disconnected", node);
notifyNodeFailure(node, "transport disconnected");
}
}
@ -214,10 +214,10 @@ public class NodesFaultDetection extends AbstractComponent {
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);
logger.debug("Node [{}] failed to 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");
notifyNodeFailure(node, "failed to ping, tried [" + pingRetryCount + "] times, each with [" + pingRetryTimeout + "] timeout");
}
} else {
// resend the request, not reschedule, rely on send timeout