[Enhancement] improve error message of killed sql (#53708)

Signed-off-by: Murphy <[email protected]> (cherry picked from commit 2d7f483) # Conflicts: # fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java
StarRocks · Dec 9, 2024 · cae12b1 · cae12b1
1 parent 52330c4
commit cae12b1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/common/util/SqlUtils.java b/fe/fe-core/src/main/java/com/starrocks/common/util/SqlUtils.java
@@ -17,7 +17,12 @@
 
 package com.starrocks.common.util;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class SqlUtils {
+
+    private static final int SQL_PREFIX_LENGTH = 128;
+
     public static String escapeUnquote(String ident) {
         return ident.replaceAll("``", "`");
     }
@@ -35,4 +40,14 @@ public static String getIdentSql(String ident) {
         sb.append('`');
         return sb.toString();
     }
+
+    /**
+     * Return the prefix of a sql if it's too long
+     */
+    public static String sqlPrefix(String sql) {
+        if (StringUtils.isEmpty(sql) || sql.length() < SQL_PREFIX_LENGTH) {
+            return sql;
+        }
+        return sql.substring(0, SQL_PREFIX_LENGTH) + "...";
+    }
 }
diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java b/fe/fe-core/src/main/java/com/starrocks/qe/ConnectContext.java
@@ -40,6 +40,12 @@
 import com.google.common.collect.Sets;
 import com.starrocks.cluster.ClusterNamespace;
 import com.starrocks.common.DdlException;
+<<<<<<< HEAD
+=======
+import com.starrocks.common.ErrorCode;
+import com.starrocks.common.ErrorReport;
+import com.starrocks.common.util.SqlUtils;
+>>>>>>> 2d7f4836d4 ([Enhancement] improve error message of killed sql (#53708))
 import com.starrocks.common.util.TimeUtils;
 import com.starrocks.http.HttpConnectContext;
 import com.starrocks.mysql.MysqlCapability;
@@ -781,7 +787,7 @@ public void kill(boolean killConnection, String cancelledMessage) {
                     Thread.sleep(10);
                     times++;
                     if (times > 100) {
-                        LOG.warn("wait for close fail, break.");
+                        LOG.warn("kill queryId={} connectId={} wait for close fail, break.", queryId, connectionId);
                         break;
                     }
                 } catch (InterruptedException e) {
@@ -812,16 +818,26 @@ public void checkTimeout(long now) {
             if (delta > sessionVariable.getWaitTimeoutS() * 1000L) {
                 // Need kill this connection.
                 LOG.warn("kill wait timeout connection, remote: {}, wait timeout: {}, query id: {}, sql: {}",
+<<<<<<< HEAD
                         getMysqlChannel().getRemoteHostPortString(), sessionVariable.getWaitTimeoutS(), queryId, sql);
+=======
+                        getMysqlChannel().getRemoteHostPortString(), waitTimeout, queryId, SqlUtils.sqlPrefix(sql));
+>>>>>>> 2d7f4836d4 ([Enhancement] improve error message of killed sql (#53708))
 
                 killFlag = true;
                 killConnection = true;
             }
         } else {
             long timeoutSecond = sessionVariable.getQueryTimeoutS();
             if (delta > timeoutSecond * 1000L) {
+<<<<<<< HEAD
                 LOG.warn("kill query timeout, remote: {}, query timeout: {}, query id: {}, sql: {}",
                         getMysqlChannel().getRemoteHostPortString(), sessionVariable.getQueryTimeoutS(), queryId, sql);
+=======
+                LOG.warn("kill timeout {}, remote: {}, execute timeout: {}, query id: {}, sql: {}",
+                        getExecType().toLowerCase(), getMysqlChannel().getRemoteHostPortString(), timeoutSecond,
+                        queryId, SqlUtils.sqlPrefix(sql));
+>>>>>>> 2d7f4836d4 ([Enhancement] improve error message of killed sql (#53708))
 
                 // Only kill
                 killFlag = true;

diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/ConnectScheduler.java b/fe/fe-core/src/main/java/com/starrocks/qe/ConnectScheduler.java
@@ -103,7 +103,7 @@ public void run() {
                 }
             } catch (Throwable e) {
                 //Catch Exception to avoid thread exit
-                LOG.warn("Timeout checker exception, Internal error : " + e.getMessage());
+                LOG.warn("Timeout checker exception, Internal error : {}", e.getMessage(), e);
             }
         }
     }

diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java b/fe/fe-core/src/main/java/com/starrocks/qe/DefaultCoordinator.java
@@ -787,7 +787,7 @@ public RowBatch getNext() throws Exception {
                 throw new RpcException("unknown", copyStatus.getErrorMsg());
             } else {
                 String errMsg = copyStatus.getErrorMsg();
-                LOG.warn("query failed: {}", errMsg);
+                LOG.warn("query {} failed: {}", connectContext.queryId, errMsg);
 
                 // hide host info
                 int hostIndex = errMsg.indexOf("host");
@@ -831,7 +831,7 @@ public void cancel(PPlanFragmentCancelReason reason, String message) {
                 queryStatus.setStatus(Status.CANCELLED);
                 queryStatus.setErrorMsg(message);
             }
-            LOG.warn("cancel execState of query, this is outside invoke");
+            LOG.info("cancel query {} because {}", connectContext.queryId, message);
             cancelInternal(reason);
         } finally {
             try {