[Enhancement] Improve query queue pending timeout error message

Signed-off-by: wyb <[email protected]>
StarRocks · Dec 13, 2024 · 0fce494 · 0fce494
1 parent 1300393
commit 0fce494
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/qe/QueryQueueManager.java b/fe/fe-core/src/main/java/com/starrocks/qe/QueryQueueManager.java
@@ -40,8 +40,7 @@ public class QueryQueueManager {
     private static final Logger LOG = LogManager.getLogger(QueryQueueManager.class);
 
     private static final String PENDING_TIMEOUT_ERROR_MSG_FORMAT =
-            "Failed to allocate resource to query: pending timeout [%d], " +
-                    "you could modify the session variable [%s] to pending more time";
+            "Failed to allocate resource to query: pending timeout [%ds], you could modify %s to pending more time";
 
     private static class SingletonHolder {
         private static final QueryQueueManager INSTANCE = new QueryQueueManager();
@@ -73,9 +72,14 @@ public void maybeWait(ConnectContext context, DefaultCoordinator coord) throws S
                 if (currentMs >= timeoutMs) {
                     MetricRepo.COUNTER_QUERY_QUEUE_TIMEOUT.increase(1L);
                     slotProvider.cancelSlotRequirement(slotRequirement);
+                    int queryQueuePendingTimeout = GlobalVariable.getQueryQueuePendingTimeoutSecond();
+                    int queryTimeout = coord.getJobSpec().getQueryOptions().query_timeout;
+                    String timeoutVar = queryQueuePendingTimeout < queryTimeout ?
+                            String.format("the session variable [%s]", GlobalVariable.QUERY_QUEUE_PENDING_TIMEOUT_SECOND) :
+                            "query/insert timeout";
                     String errMsg = String.format(PENDING_TIMEOUT_ERROR_MSG_FORMAT,
-                            GlobalVariable.getQueryQueuePendingTimeoutSecond(),
-                            GlobalVariable.QUERY_QUEUE_PENDING_TIMEOUT_SECOND);
+                            Math.min(queryQueuePendingTimeout, queryTimeout),
+                            timeoutVar);
                     ResourceGroupMetricMgr.increaseTimeoutQueuedQuery(context, 1L);
                     throw new StarRocksException(errMsg);
                 }

diff --git a/fe/fe-core/src/test/java/com/starrocks/qe/scheduler/QueryQueueManagerTest.java b/fe/fe-core/src/test/java/com/starrocks/qe/scheduler/QueryQueueManagerTest.java
@@ -20,6 +20,7 @@
 import com.starrocks.catalog.ResourceGroupClassifier;
 import com.starrocks.catalog.ResourceGroupMgr;
 import com.starrocks.common.Config;
+import com.starrocks.common.ExceptionChecker;
 import com.starrocks.common.Pair;
 import com.starrocks.common.StarRocksException;
 import com.starrocks.ha.FrontendNodeType;
@@ -599,6 +600,9 @@ public void testPendingTimeout() throws Exception {
             DefaultCoordinator coord = getSchedulerWithQueryId("select count(1) from lineitem");
             Assert.assertThrows("pending timeout", StarRocksException.class,
                     () -> manager.maybeWait(connectContext, coord));
+            ExceptionChecker.expectThrowsWithMsg(StarRocksException.class,
+                    "the session variable [query_queue_pending_timeout_second]",
+                    () -> manager.maybeWait(connectContext, coord));
         }
 
         {
@@ -608,6 +612,9 @@ public void testPendingTimeout() throws Exception {
                     getSchedulerWithQueryId("select /*+SET_VAR(query_timeout=2)*/ count(1) from lineitem");
             Assert.assertThrows("pending timeout", StarRocksException.class,
                     () -> manager.maybeWait(connectContext, coord));
+            ExceptionChecker.expectThrowsWithMsg(StarRocksException.class,
+                    "query/insert timeout",
+                    () -> manager.maybeWait(connectContext, coord));
         }
 
         {