Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[inner-2361&2356] fix: the results of show trace are incomplete #3823

Merged
merged 2 commits into from
Sep 20, 2023
Merged

[inner-2361&2356] fix: the results of show trace are incomplete #3823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dab9326
[inner-2356] adjust tips
wenyh1 Sep 19, 2023
00b911b
[inner-2361] fix: the results of show trace are incomplete
wenyh1 Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/actiontech/dble/backend/datasource/PhysicalDbGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLResponseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -419,6 +420,7 @@ protected boolean innerRelease() {
}
complexQuery = false;
attachment = null;
traceRouteKey = null;
statusSync = null;
isDDL = false;
testing = false;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/actiontech/dble/singleton/ThreadManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down