Merge pull request #29494 from ClickHouse/fix-possible-pushing-execut…

…or-hang Fix possible hang in PushingAsyncPipelineExecutor.
ClickHouse · Sep 29, 2021 · 8d85590 · 8d85590
2 parents 1a0feaa + ee2c12b
commit 8d85590
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
@@ -41,6 +41,7 @@ class PushingAsyncSource : public ISource
 
     void finish()
     {
+        std::unique_lock lock(mutex);
         is_finished = true;
         condvar.notify_all();
     }
@@ -64,7 +65,7 @@ class PushingAsyncSource : public ISource
 private:
     Chunk data;
     bool has_data = false;
-    std::atomic_bool is_finished = false;
+    bool is_finished = false;
     std::mutex mutex;
     std::condition_variable condvar;
 };