Merge pull request #3550 from actiontech/inner/2049

[inner-2049] adjust log

src/main/java/com/actiontech/dble/config/ServerConfig.java

@@ -358,8 +358,8 @@ public class ServerConfig {
         List<String> delSchema = new ArrayList<>();
         List<String> reloadSchema = new ArrayList<>();
         if (isFullyConfigured) {
+            ReloadLogHelper.briefInfo("calcDiffForMetaData ...");
             calcDiffForMetaData(newSchemas, newShardingNodes, loadAllMode, delTables, reloadTables, delSchema, reloadSchema);
-            ReloadLogHelper.briefInfo("calcDiffForMetaData end");
         }
         final ReentrantLock metaLock = ProxyMeta.getInstance().getTmManager().getMetaLock();
         metaLock.lock();
@@ -367,8 +367,8 @@ public class ServerConfig {
         try {
             ReloadLogHelper.briefInfo("added metaLock");
             // user in use cannot be deleted
+            ReloadLogHelper.briefInfo("checkUser ...");
             checkUser(changeItemList);
-            ReloadLogHelper.briefInfo("checkUser end");
             String checkResult = ProxyMeta.getInstance().getTmManager().metaCountCheck();
             if (checkResult != null) {
                 LOGGER.warn(checkResult);
@@ -394,7 +394,7 @@ public class ServerConfig {
                 newDbGroups = oldDbGroups;
             }
             ReloadLogHelper.briefInfo("init new dbGroup end");
-
+            ReloadLogHelper.briefInfo("config the transformation ...");
             this.shardingNodes = newShardingNodes;
             this.dbGroups = newDbGroups;
             this.fullyConfigured = isFullyConfigured;
@@ -411,11 +411,10 @@ public class ServerConfig {
             this.shardingConfig = shardingJsonConfig;
             this.sequenceConfig = sequenceJsonConfig;
             this.lowerCase = DbleTempConfig.getInstance().isLowerCase();
-            ReloadLogHelper.briefInfo("config the transformation end");
 
             try {
+                ReloadLogHelper.briefInfo("ha config init ...");
                 HaConfigManager.getInstance().init(true);
-                ReloadLogHelper.briefInfo("ha config init end");
             } catch (Exception e) {
                 throw new SQLNonTransientException("HaConfigManager init failed", "HY000", ErrorCode.ER_YES);
             }

src/main/java/com/actiontech/dble/meta/table/ServerMetaHandler.java

@@ -104,7 +104,7 @@ public class ServerMetaHandler {
                 allSchemaDone.await();
             }
         } catch (InterruptedException e) {
-            ReloadLogHelper.briefInfo("waitAllSchemaDone " + e);
+            ReloadLogHelper.briefInfo("waitAllSchemaDone interrupted: " + e);
         } finally {
             lock.unlock();
         }

src/main/java/com/actiontech/dble/services/manager/response/ReloadConfig.java

@@ -237,13 +237,12 @@ public final class ReloadConfig {
         sequenceConfig = sequenceConfig == null ? DbleServer.getInstance().getConfig().getSequenceConfig() : sequenceConfig;
         final boolean reloadResult = reload(loadAllMode, userConfig, dbConfig, shardingConfig, sequenceConfig);
 
-        ReloadLogHelper.briefInfo("clean temp config");
+        ReloadLogHelper.briefInfo("clean temp config ...");
         DbleTempConfig.getInstance().clean();
         //sync json to local
+        if (isWriteToLocal)
+            ReloadLogHelper.briefInfo("sync json to local ...");
         DbleServer.getInstance().getConfig().syncJsonToLocal(isWriteToLocal);
-        if (isWriteToLocal) {
-            ReloadLogHelper.briefInfo("sync json to local");
-        }
         return reloadResult;
     }
 
@@ -278,12 +277,12 @@ public final class ReloadConfig {
             // lowerCase && load sequence
             if (loader.isFullyConfigured()) {
                 if (newSystemVariables.isLowerCaseTableNames()) {
-                    ReloadLogHelper.briefInfo("dbGroup's lowerCaseTableNames=1, lower the config properties start");
+                    ReloadLogHelper.briefInfo("dbGroup's lowerCaseTableNames=1, lower the config properties ...");
                     newConfig.reviseLowerCase();
                 }
-                ReloadLogHelper.briefInfo("loadSequence start");
+                ReloadLogHelper.briefInfo("loadSequence ...");
                 newConfig.loadSequence(loader.getSequenceConfig());
-                ReloadLogHelper.briefInfo("selfChecking0 start");
+                ReloadLogHelper.briefInfo("selfChecking0 ...");
                 newConfig.selfChecking0();
             }
 
@@ -403,7 +402,7 @@ public final class ReloadConfig {
                         "memory to sequence is :{}", userConfig, dbConfig, shardingConfig, sequenceConfig);
                 loader = new ConfigInitializer(userConfig, dbConfig, shardingConfig, sequenceConfig);
             }
-            ReloadLogHelper.briefInfo("load config end");
+            ReloadLogHelper.briefInfo("load info end");
             return loader;
         } catch (Exception e) {
             throw new Exception(e.getMessage() == null ? e.toString() : e.getMessage(), e);

src/main/java/com/actiontech/dble/singleton/HaConfigManager.java

@@ -196,9 +196,9 @@ public final class HaConfigManager {
             resultString.append("\n result status of dbGroup :").append(result);
         }
         if (errorMsg == null) {
-            info(resultString.toString());
+            HA_LOGGER.info(resultString.toString());
         } else {
-            warn(resultString.toString());
+            HA_LOGGER.warn(resultString.toString());
         }
     }