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

nicer logging

This commit is contained in:
kimchy 2010-06-17 12:46:05 +03:00
parent d1c7bde07e
commit 86134d32a8
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ public class MasterFaultDetection extends AbstractComponent {
this.pingRetryCount = componentSettings.getAsInt("ping_retries", 3); this.pingRetryCount = componentSettings.getAsInt("ping_retries", 3);
this.registerConnectionListener = componentSettings.getAsBoolean("register_connection_listener", true); this.registerConnectionListener = componentSettings.getAsBoolean("register_connection_listener", true);
logger.debug("Master FD uses ping_interval [{}], ping_timeout [{}], ping_retries [{}]", pingInterval, pingRetryTimeout, pingRetryCount); logger.debug("[master] uses ping_interval [{}], ping_timeout [{}], ping_retries [{}]", pingInterval, pingRetryTimeout, pingRetryCount);
this.connectionListener = new FDConnectionListener(); this.connectionListener = new FDConnectionListener();
if (registerConnectionListener) { if (registerConnectionListener) {
@ -122,7 +122,7 @@ public class MasterFaultDetection extends AbstractComponent {
public void restart(DiscoveryNode masterNode, String reason) { public void restart(DiscoveryNode masterNode, String reason) {
synchronized (masterNodeMutex) { synchronized (masterNodeMutex) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Restarting fault detection against master [{}], reason [{}]", masterNode, reason); logger.debug("[master] restarting fault detection against master [{}], reason [{}]", masterNode, reason);
} }
innerStop(); innerStop();
innerStart(masterNode); innerStart(masterNode);
@ -132,7 +132,7 @@ public class MasterFaultDetection extends AbstractComponent {
public void start(final DiscoveryNode masterNode, String reason) { public void start(final DiscoveryNode masterNode, String reason) {
synchronized (masterNodeMutex) { synchronized (masterNodeMutex) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Starting fault detection against master [{}], reason [{}]", masterNode, reason); logger.debug("[master] starting fault detection against master [{}], reason [{}]", masterNode, reason);
} }
innerStart(masterNode); innerStart(masterNode);
} }
@ -163,7 +163,7 @@ public class MasterFaultDetection extends AbstractComponent {
synchronized (masterNodeMutex) { synchronized (masterNodeMutex) {
if (masterNode != null) { if (masterNode != null) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Stopping fault detection against master [{}], reason [{}]", masterNode, reason); logger.debug("[master] stopping fault detection against master [{}], reason [{}]", masterNode, reason);
} }
} }
innerStop(); innerStop();
@ -196,11 +196,11 @@ public class MasterFaultDetection extends AbstractComponent {
try { try {
transportService.connectToNode(node); transportService.connectToNode(node);
} catch (Exception e) { } catch (Exception e) {
logger.trace("Master [{}] transport disconnected (with verified connect)", masterNode); logger.trace("[master] [{}] transport disconnected (with verified connect)", masterNode);
notifyMasterFailure(masterNode, "transport disconnected (with verified connect)"); notifyMasterFailure(masterNode, "transport disconnected (with verified connect)");
} }
} else { } else {
logger.trace("Master [{}] transport disconnected", node); logger.trace("[master] [{}] transport disconnected", node);
notifyMasterFailure(node, "transport disconnected"); notifyMasterFailure(node, "transport disconnected");
} }
} }
@ -268,7 +268,7 @@ public class MasterFaultDetection extends AbstractComponent {
// check if the master node did not get switched on us..., if it did, we simply return with no reschedule // check if the master node did not get switched on us..., if it did, we simply return with no reschedule
if (masterToPing.equals(MasterFaultDetection.this.masterNode())) { if (masterToPing.equals(MasterFaultDetection.this.masterNode())) {
if (!response.connectedToMaster) { if (!response.connectedToMaster) {
logger.trace("Master [{}] does not have us registered with it...", masterToPing); logger.trace("[master] [{}] does not have us registered with it...", masterToPing);
notifyDisconnectedFromMaster(); notifyDisconnectedFromMaster();
} }
// we don't stop on disconnection from master, we keep pinging it // we don't stop on disconnection from master, we keep pinging it
@ -284,11 +284,11 @@ public class MasterFaultDetection extends AbstractComponent {
// check if the master node did not get switched on us... // check if the master node did not get switched on us...
if (masterToPing.equals(MasterFaultDetection.this.masterNode())) { if (masterToPing.equals(MasterFaultDetection.this.masterNode())) {
int retryCount = ++MasterFaultDetection.this.retryCount; int retryCount = ++MasterFaultDetection.this.retryCount;
logger.trace("Master [{}] failed to ping, retry [{}] out of [{}]", exp, masterNode, retryCount, pingRetryCount); logger.trace("[master] failed to ping [{}], retry [{}] out of [{}]", exp, masterNode, retryCount, pingRetryCount);
if (retryCount >= pingRetryCount) { if (retryCount >= pingRetryCount) {
logger.debug("Master [{}] failed to ping, tried [{}] times, each with [{}] timeout", masterNode, pingRetryCount, pingRetryTimeout); logger.debug("[master] failed to ping [{}], tried [{}] times, each with maximum [{}] timeout", masterNode, pingRetryCount, pingRetryTimeout);
// not good, failure // not good, failure
notifyMasterFailure(masterToPing, "failed to ping, tried [" + pingRetryCount + "] times, each with [" + pingRetryTimeout + "] timeout"); notifyMasterFailure(masterToPing, "failed to ping, tried [" + pingRetryCount + "] times, each with maximum [" + pingRetryTimeout + "] timeout");
} else { } else {
// resend the request, not reschedule, rely on send timeout // resend the request, not reschedule, rely on send timeout
transportService.sendRequest(masterToPing, MasterPingRequestHandler.ACTION, new MasterPingRequest(nodesProvider.nodes().localNode().id(), masterToPing.id()), pingRetryTimeout, this); 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

@ -89,7 +89,7 @@ public class NodesFaultDetection extends AbstractComponent {
this.pingRetryCount = componentSettings.getAsInt("ping_retries", 3); this.pingRetryCount = componentSettings.getAsInt("ping_retries", 3);
this.registerConnectionListener = componentSettings.getAsBoolean("register_connection_listener", true); this.registerConnectionListener = componentSettings.getAsBoolean("register_connection_listener", true);
logger.debug("Nodes FD uses ping_interval [{}], ping_timeout [{}], ping_retries [{}]", pingInterval, pingRetryTimeout, pingRetryCount); logger.debug("[node ] uses ping_interval [{}], ping_timeout [{}], ping_retries [{}]", pingInterval, pingRetryTimeout, pingRetryCount);
transportService.registerHandler(PingRequestHandler.ACTION, new PingRequestHandler()); transportService.registerHandler(PingRequestHandler.ACTION, new PingRequestHandler());
@ -166,11 +166,11 @@ public class NodesFaultDetection extends AbstractComponent {
try { try {
transportService.connectToNode(node); transportService.connectToNode(node);
} catch (Exception e) { } catch (Exception e) {
logger.trace("Node [{}] transport disconnected (with verified connect)", node); logger.trace("[node ] [{}] transport disconnected (with verified connect)", node);
notifyNodeFailure(node, "transport disconnected (with verified connect)"); notifyNodeFailure(node, "transport disconnected (with verified connect)");
} }
} else { } else {
logger.trace("Node [{}] transport disconnected", node); logger.trace("[node ] [{}] transport disconnected", node);
notifyNodeFailure(node, "transport disconnected"); notifyNodeFailure(node, "transport disconnected");
} }
} }
@ -218,12 +218,12 @@ public class NodesFaultDetection extends AbstractComponent {
NodeFD nodeFD = nodesFD.get(node); NodeFD nodeFD = nodesFD.get(node);
if (nodeFD != null) { if (nodeFD != null) {
int retryCount = ++nodeFD.retryCount; int retryCount = ++nodeFD.retryCount;
logger.trace("Node [{}] failed to ping, retry [{}] out of [{}]", exp, node, retryCount, pingRetryCount); logger.trace("[node ] failed to ping [{}], retry [{}] out of [{}]", exp, node, retryCount, pingRetryCount);
if (retryCount >= pingRetryCount) { if (retryCount >= pingRetryCount) {
logger.debug("Node [{}] failed to ping, tried [{}] times, each with [{}] timeout", node, pingRetryCount, pingRetryTimeout); logger.debug("[node ] failed to ping [{}], tried [{}] times, each with maximum [{}] timeout", node, pingRetryCount, pingRetryTimeout);
// not good, failure // not good, failure
if (nodesFD.remove(node) != null) { if (nodesFD.remove(node) != null) {
notifyNodeFailure(node, "failed to ping, tried [" + pingRetryCount + "] times, each with [" + pingRetryTimeout + "] timeout"); notifyNodeFailure(node, "failed to ping, tried [" + pingRetryCount + "] times, each with maximum [" + pingRetryTimeout + "] timeout");
} }
} else { } else {
// resend the request, not reschedule, rely on send timeout // resend the request, not reschedule, rely on send timeout