diff --git a/src/main/java/com/actiontech/dble/backend/delyDetection/DelayDetection.java b/src/main/java/com/actiontech/dble/backend/delyDetection/DelayDetection.java index 42b529a313..459237555c 100644 --- a/src/main/java/com/actiontech/dble/backend/delyDetection/DelayDetection.java +++ b/src/main/java/com/actiontech/dble/backend/delyDetection/DelayDetection.java @@ -229,14 +229,14 @@ public void updateLastReceivedQryTime() { } private void setTimeout() { - LOGGER.warn("delayDetection to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl() + "] setTimeout"); + LOGGER.warn("delayDetection to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl() + "] setTimeout"); delayDetectionStatus = DelayDetectionStatus.TIMEOUT; source.setDelayDetectionStatus(delayDetectionStatus); alert(AlarmCode.DB_SLAVE_INSTANCE_DELAY, errorMessage, dbGroupConfig.instanceDatabaseType().name().toLowerCase()); } private void setError() { - LOGGER.warn("delayDetection to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl() + "] setError"); + LOGGER.warn("delayDetection to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl() + "] setError"); delayDetectionStatus = DelayDetectionStatus.ERROR; source.setDelayDetectionStatus(delayDetectionStatus); if (!source.isReadInstance()) { @@ -245,7 +245,7 @@ private void setError() { } private void setOk() { - LOGGER.debug("delayDetection to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl() + "] setOK"); + LOGGER.debug("delayDetection to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl() + "] setOK"); if (errorCount.get() > 0) { errorCount.set(0); } diff --git a/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java b/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java index 98ebeb13d5..1fee4e6152 100644 --- a/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java +++ b/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java @@ -108,10 +108,10 @@ public void start(long heartbeatPeriodMillis) { public void stop(String reason) { if (isStop) { - LOGGER.warn("heartbeat[{}] had been stop", source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl()); + LOGGER.warn("heartbeat[{}] had been stop", source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl()); return; } - LOGGER.info("stop heartbeat of instance[{}], due to {}", source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl(), reason); + LOGGER.info("stop heartbeat of instance[{}], due to {}", source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl(), reason); isStop = true; scheduledFuture.cancel(false); initHeartbeat.set(false); @@ -164,7 +164,7 @@ boolean doHeartbeatRetry() { } void setErrorResult(String errMsg) { - LOGGER.warn("heartbeat to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl() + "] setError"); + LOGGER.warn("heartbeat to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl() + "] setError"); // should continue checking error status if (detector != null) { detector.quit(); @@ -203,7 +203,7 @@ void setResult(MySQLHeartbeatStatus result) { private void setOk() { if (LOGGER.isDebugEnabled()) { - LOGGER.debug("heartbeat to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl() + "] setOK"); + LOGGER.debug("heartbeat to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl() + "] setOK"); } MySQLHeartbeatStatus previousStatus = status; switch (status) { @@ -212,17 +212,17 @@ private void setOk() { this.errorCount.set(0); this.startErrorTime.set(-1); if (isStop) { - LOGGER.warn("heartbeat[{}] had been stop", source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl()); + LOGGER.warn("heartbeat[{}] had been stop", source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl()); detector.quit(); } else { - LOGGER.info("heartbeat to [{}] setOk, previous status is timeout", source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl()); + LOGGER.info("heartbeat to [{}] setOk, previous status is timeout", source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl()); heartbeat(); // timeout, heart beat again } break; case OK: break; default: - LOGGER.info("heartbeat to [{}] setOk, previous status is {}", source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl(), status); + LOGGER.info("heartbeat to [{}] setOk, previous status is {}", source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl(), status); this.status = MySQLHeartbeatStatus.OK; this.errorCount.set(0); this.startErrorTime.set(-1); @@ -236,7 +236,7 @@ private void setOk() { source.updatePoolCapacity(); } if (isStop) { - LOGGER.warn("heartbeat[{}] had been stop", source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl()); + LOGGER.warn("heartbeat[{}] had been stop", source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl()); detector.quit(); } } @@ -253,10 +253,10 @@ private void recordErrorCount() { private void setTimeout() { if (LOGGER.isDebugEnabled()) { - LOGGER.debug("heartbeat to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl() + "] setTimeout"); + LOGGER.debug("heartbeat to [" + source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl() + "] setTimeout"); } if (status != MySQLHeartbeatStatus.TIMEOUT) { - LOGGER.warn("heartbeat to [{}] setTimeout, previous status is {}", source.getDbGroupConfig().getName() + ":" + source.getConfig().getUrl() + ":" + source.getConfig().getUrl(), status); + LOGGER.warn("heartbeat to [{}] setTimeout, previous status is {}", source.getDbGroupConfig().getName() + ":" + source.getConfig().getInstanceName() + ":" + source.getConfig().getUrl(), status); status = MySQLHeartbeatStatus.TIMEOUT; } }