Merge pull request #3823 from actiontech/inner-2361&2356

[inner-2361&2356] fix: the results of show trace are incomplete
actiontech · Sep 20, 2023 · e4da171 · e4da171
2 parents f6c328d + 00b911b
commit e4da171
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/actiontech/dble/backend/datasource/PhysicalDbGroup.java b/src/main/java/com/actiontech/dble/backend/datasource/PhysicalDbGroup.java
@@ -330,7 +330,7 @@ public void startHeartbeat() {
 
     public void startDelayDetection() {
         for (PhysicalDbInstance dbInstance : allSourceMap.values()) {
-            if (dbInstance.delayDetection.isStop()) {
+            if (dbInstance.delayDetection != null && dbInstance.delayDetection.isStop()) {
                 dbInstance.delayDetection = new DelayDetection(dbInstance);
             }
             dbInstance.startDelayDetection();

diff --git a/src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLResponseService.java b/src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLResponseService.java
@@ -125,6 +125,7 @@ public void execute(byte[] originPacket) {
 
         write(originPacket, WriteFlags.QUERY_END);
     }
+
     public void execute(BusinessService service, String sql) {
         execute(service, sql, false);
     }
@@ -419,6 +420,7 @@ protected boolean innerRelease() {
         }
         complexQuery = false;
         attachment = null;
+        traceRouteKey = null;
         statusSync = null;
         isDDL = false;
         testing = false;

diff --git a/src/main/java/com/actiontech/dble/singleton/ThreadManager.java b/src/main/java/com/actiontech/dble/singleton/ThreadManager.java
@@ -115,7 +115,7 @@ public static void recoverSingleThread(String threadName) throws Exception {
                     }
                     break;
                 default:
-                    throw new Exception("The recover operation of threadPool[" + threadName + "] is not supported");
+                    throw new Exception("The recover operation of thread[" + threadName + "] is not supported");
             }
         } else {
             throw new Exception("The recover operation of thread[" + threadName + "] is not supported");