From e516c7d54a856f3269c0801d00581a2f2fd09e61 Mon Sep 17 00:00:00 2001
From: yiguolei <guolei@selectdb.com>
Date: Tue, 24 Dec 2024 18:57:02 +0800
Subject: [PATCH] [enhancement](blacklist) ignore shutdown message to avoid add
 the backend to blacklist

---
 .../src/main/java/org/apache/doris/qe/ResultReceiver.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java
index 43ad573bf795ef..9d234ae9e69f33 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ResultReceiver.java
@@ -179,7 +179,10 @@ public RowBatch getNext(Status status) throws TException {
                 status.updateStatus(TStatusCode.TIMEOUT, e.getMessage());
             } else {
                 status.updateStatus(TStatusCode.THRIFT_RPC_ERROR, e.getMessage());
-                SimpleScheduler.addToBlacklist(backendId, e.getMessage());
+                // Shutdown maybe called by other request, should ignore this case.
+                if (!e.getMessage().contains("shutdown")) {
+                    SimpleScheduler.addToBlacklist(backendId, e.getMessage());
+                }
             }
         } catch (TimeoutException e) {
             LOG.warn("fetch result timeout, finstId={}", DebugUtil.printId(finstId), e);