Backport #93029 to 25.12: Fix leaving connection in a broken state after preliminary cancellation distributed queries

robot-clickhouse · robot-clickhouse · commit d32b15b63a41 · 2025-12-25T08:16:52.000Z
diff --git a/src/QueryPipeline/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -778,9 +778,6 @@ void RemoteQueryExecutor::finish()
 {
     LockAndBlocker guard(was_cancelled_mutex);
 
-    /// To make sure finish is only called once
-    SCOPE_EXIT({ finished = true; });
-
     /** If one of:
       * - nothing started to do;
       * - received all packets before EndOfStream;
@@ -791,6 +788,9 @@ void RemoteQueryExecutor::finish()
     if (!isQueryPending() || hasThrownException())
         return;
 
+    /// To make sure finish is only called once
+    SCOPE_EXIT({ finished = true; });
+
     /** If you have not read all the data yet, but they are no longer needed.
       * This may be due to the fact that the data is sufficient (for example, when using LIMIT).
       */
