mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-05 04:10:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix ucore print dble

Browse Source 
fix
This commit is contained in:
yuanlinzhu
2024-12-05 13:52:00 +08:00
parent a3001c3468
commit 63e511be51
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/oceanbase/obsharding_d/cluster/AbstractGeneralListener.java
View File

@@ -59,7 +59,7 @@ public abstract class AbstractGeneralListener<T> implements GeneralListener<T>,
@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;

2
src/main/java/com/oceanbase/obsharding_d/cluster/general/AbstractConsulSender.java
View File

@@ -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);
}

17
src/main/java/com/oceanbase/obsharding_d/cluster/logic/ConfigClusterLogic.java
View File

@@ -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<String> 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);
}

3
src/main/java/com/oceanbase/obsharding_d/meta/ReloadLogHelper.java
View File

@@ -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<String> keySet) {