From 63e511be515d34f26c43c803bd68528dafe8d85e Mon Sep 17 00:00:00 2001 From: yuanlinzhu Date: Thu, 5 Dec 2024 13:52:00 +0800 Subject: [PATCH] fix ucore print dble fix --- .../cluster/AbstractGeneralListener.java | 2 +- .../cluster/general/AbstractConsulSender.java | 2 +- .../cluster/logic/ConfigClusterLogic.java | 17 +++++++++-------- .../obsharding_d/meta/ReloadLogHelper.java | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/oceanbase/obsharding_d/cluster/AbstractGeneralListener.java b/src/main/java/com/oceanbase/obsharding_d/cluster/AbstractGeneralListener.java index 6c5bf189a..86248850f 100644 --- a/src/main/java/com/oceanbase/obsharding_d/cluster/AbstractGeneralListener.java +++ b/src/main/java/com/oceanbase/obsharding_d/cluster/AbstractGeneralListener.java @@ -59,7 +59,7 @@ public abstract class AbstractGeneralListener implements GeneralListener, @Override public final void notifyProcess(OriginClusterEvent changeEvent, boolean ignoreTheGrandChild) throws Exception { - logger.info("event happen in {}, path: {},type: {},data: {}", this.getClass().getSimpleName(), changeEvent.getPath(), changeEvent.getChangeType(), changeEvent.getValue()); + logger.info("event happen in {},type: {},data: {}", this.getClass().getSimpleName(), changeEvent.getChangeType(), changeEvent.getValue()); //ucore may receive the grandchildren event.But zk only receive the children event. remove grandchildren event if needed if (ignoreTheGrandChild && ClusterLogic.forGeneral().getPathHeight(changeEvent.getPath()) != pathHeight + 1) { return; diff --git a/src/main/java/com/oceanbase/obsharding_d/cluster/general/AbstractConsulSender.java b/src/main/java/com/oceanbase/obsharding_d/cluster/general/AbstractConsulSender.java index 5de648f83..bd33f286e 100644 --- a/src/main/java/com/oceanbase/obsharding_d/cluster/general/AbstractConsulSender.java +++ b/src/main/java/com/oceanbase/obsharding_d/cluster/general/AbstractConsulSender.java @@ -101,7 +101,7 @@ public abstract class AbstractConsulSender implements ClusterSender { } setKV(selfPath, value); - LOGGER.info("writeDirectly self node for path:" + selfPath); + //LOGGER.info("writeDirectly self node for path:" + selfPath); } diff --git a/src/main/java/com/oceanbase/obsharding_d/cluster/logic/ConfigClusterLogic.java b/src/main/java/com/oceanbase/obsharding_d/cluster/logic/ConfigClusterLogic.java index f472131ad..b0152e335 100644 --- a/src/main/java/com/oceanbase/obsharding_d/cluster/logic/ConfigClusterLogic.java +++ b/src/main/java/com/oceanbase/obsharding_d/cluster/logic/ConfigClusterLogic.java @@ -177,7 +177,7 @@ public class ConfigClusterLogic extends AbstractClusterLogic { } public void syncSequenceJson(String path, RawJson value) throws Exception { - LOGGER.info("start sync sequence json config:key[{}],value[{}]", path, value); + LOGGER.info("start sync sequence json config:value[{}]", value); String lock = clusterHelper.getPathValue(ClusterMetaUtil.getConfChangeLockPath()).map(ClusterValue::getInstanceName).orElse(null); if (lock != null && SystemConfig.getInstance().getInstanceName().equals(lock)) { return; @@ -185,7 +185,7 @@ public class ConfigClusterLogic extends AbstractClusterLogic { OBsharding_DTempConfig.getInstance().setSequenceConfig(value); - LOGGER.info("end sync sequence json config:key[{}],value[{}]", path, value); + LOGGER.info("end sync sequence json config:value[{}]", value); } @@ -209,7 +209,7 @@ public class ConfigClusterLogic extends AbstractClusterLogic { } public void syncDbJson(String path, RawJson value) throws Exception { - LOGGER.info("start sync db json config:key[{}],value[{}]", path, value); + LOGGER.info("start sync db json config:value[{}]", value); String lock = clusterHelper.getPathValue(ClusterMetaUtil.getConfChangeLockPath()).map(ClusterValue::getInstanceName).orElse(null); if (lock != null && SystemConfig.getInstance().getInstanceName().equals(lock)) { return; @@ -217,7 +217,8 @@ public class ConfigClusterLogic extends AbstractClusterLogic { OBsharding_DTempConfig.getInstance().setDbConfig(value); - LOGGER.info("end sync db json config:key[{}],value[{}]", path, value); + LOGGER.info("end sync db json config:value[{}]", value); + } /** @@ -302,7 +303,7 @@ public class ConfigClusterLogic extends AbstractClusterLogic { public void syncShardingJson(String path, RawJson value) throws Exception { - LOGGER.info("start sync sharding json config:key[{}],value[{}]", path, value); + LOGGER.info("start sync sharding json config:value[{}]", value); String lock = clusterHelper.getPathValue(ClusterMetaUtil.getConfChangeLockPath()).map(ClusterValue::getInstanceName).orElse(null); if (lock != null && SystemConfig.getInstance().getInstanceName().equals(lock)) { return; @@ -312,7 +313,7 @@ public class ConfigClusterLogic extends AbstractClusterLogic { this.handlerMapFileAddFunction(sharding.getFunction(), true); OBsharding_DTempConfig.getInstance().setShardingConfig(value); - LOGGER.info("end sync sharding json config:key[{}],value[{}]", path, value); + LOGGER.info("end sync sharding json config:value[{}]", value); } @@ -366,7 +367,7 @@ public class ConfigClusterLogic extends AbstractClusterLogic { } public void syncUserJson(String key, RawJson value) throws Exception { - LOGGER.info("start sync user json config:key[{}],value[{}]", key, value); + LOGGER.info("start sync user json config:value[{}]", value); Optional lock = clusterHelper.getPathValue(ClusterMetaUtil.getConfChangeLockPath()).map(ClusterValue::getInstanceName); if (lock.isPresent() && SystemConfig.getInstance().getInstanceName().equals(lock.get())) { return; @@ -374,7 +375,7 @@ public class ConfigClusterLogic extends AbstractClusterLogic { OBsharding_DTempConfig.getInstance().setUserConfig(value); - LOGGER.info("end sync user json config:key[{}],value[{}]", key, value); + LOGGER.info("end sync user json config:value[{}]", value); } diff --git a/src/main/java/com/oceanbase/obsharding_d/meta/ReloadLogHelper.java b/src/main/java/com/oceanbase/obsharding_d/meta/ReloadLogHelper.java index 1a0c3e7b1..e95c8213f 100644 --- a/src/main/java/com/oceanbase/obsharding_d/meta/ReloadLogHelper.java +++ b/src/main/java/com/oceanbase/obsharding_d/meta/ReloadLogHelper.java @@ -69,7 +69,8 @@ public class ReloadLogHelper { } public static void graceInfo(String message) { - LOGGER.info("[RL][NONE] " + message); + String newMessage = message.replace("dble", "OBsharding-D"); + LOGGER.info("[RL][NONE] " + newMessage); } public static void infoList2(String message, Set keySet) {