From 79a38c4c6ea5254f9e53a5cdd81600bd269b7d6b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 10 Jan 2021 06:35:05 +0300
Subject: [PATCH] Fix hang at shutdown in clickhouse-local

---
 programs/local/LocalServer.cpp                         |  7 ++++---
 .../0_stateless/01647_clickhouse_local_hung.reference  |  1 +
 .../queries/0_stateless/01647_clickhouse_local_hung.sh | 10 ++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01647_clickhouse_local_hung.reference
 create mode 100755 tests/queries/0_stateless/01647_clickhouse_local_hung.sh

diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index dbf153eeb81..1fee37985a7 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -273,11 +273,12 @@ try
     global_context->setCurrentDatabase(default_database);
     applyCmdOptions(*global_context);
 
-    String path = global_context->getPath();
-    if (!path.empty())
+    if (config().has("path"))
     {
+        String path = global_context->getPath();
+
         /// Lock path directory before read
-        status.emplace(global_context->getPath() + "status", StatusFile::write_full_info);
+        status.emplace(path + "status", StatusFile::write_full_info);
 
         LOG_DEBUG(log, "Loading metadata from {}", path);
         Poco::File(path + "data/").createDirectories();
diff --git a/tests/queries/0_stateless/01647_clickhouse_local_hung.reference b/tests/queries/0_stateless/01647_clickhouse_local_hung.reference
new file mode 100644
index 00000000000..8925955b88e
--- /dev/null
+++ b/tests/queries/0_stateless/01647_clickhouse_local_hung.reference
@@ -0,0 +1 @@
+    100 14
diff --git a/tests/queries/0_stateless/01647_clickhouse_local_hung.sh b/tests/queries/0_stateless/01647_clickhouse_local_hung.sh
new file mode 100755
index 00000000000..04f32055ab6
--- /dev/null
+++ b/tests/queries/0_stateless/01647_clickhouse_local_hung.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+for _ in {1..100}; do echo 'Hello, world!' | ${CLICKHOUSE_LOCAL} --query "SELECT * FROM table" --structure 's String' | wc -c; done | uniq -c