This is an automated cherry-pick of pingcap#5433

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp

@@ -185,10 +185,14 @@ void ParallelAggregatingBlockInputStream::Handler::onException(std::exception_pt
     Int32 old_value = -1;
     parent.first_exception_index.compare_exchange_strong(old_value, static_cast<Int32>(thread_num), std::memory_order_seq_cst, std::memory_order_relaxed);
 
-    /// can not cancel parent inputStream or the exception might be lost
     if (!parent.executed)
+<<<<<<< HEAD
         /// kill the processor so ExchangeReceiver will be closed
         parent.processor.cancel(true);
+=======
+        /// use cancel instead of kill to avoid too many useless error message
+        parent.cancel(false);
+>>>>>>> 7b280755ba (fix a panic issue in parallel agg when exception is thrown (#5433))
 }