From 844960195d5e8d6a42f7cf4d48adcb18bcb4a304 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 21 Jun 2020 16:55:18 +0300
Subject: [PATCH] Fix memory accounting via HTTP interface

function perf_test()
{
    time yes '127.1:8123/?wait_end_of_query=1' | head -n10000 | xargs -P10000 curl -s -d 'select 1' | grep -x -c 1
}
function server()
{
    local limit=$1 && shift
    clickhouse-server "$@" -- --max_server_memory_usage=$limit
}

perf_test:

- before this patch with 1G  limit: succeed only ~800  queries
- after  this patch with 1G  limit: succeed      ~8000 queries

- before this patch with 10G limit: succeed only ~3000  queries
- after  this patch with 10G limit: succeed      ~10000 queries

Fixes: #11153
---
 src/Server/HTTPHandler.cpp | 12 +++++++-----
 src/Server/HTTPHandler.h   |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index e866af2f49b..cd26f9e88fc 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -232,15 +232,12 @@ HTTPHandler::HTTPHandler(IServer & server_, const std::string & name)
 
 
 void HTTPHandler::processQuery(
+    Context & context,
     Poco::Net::HTTPServerRequest & request,
     HTMLForm & params,
     Poco::Net::HTTPServerResponse & response,
     Output & used_output)
 {
-    Context context = server.context();
-
-    CurrentThread::QueryScope query_scope(context);
-
     LOG_TRACE(log, "Request URI: {}", request.getURI());
 
     std::istream & istr = request.stream();
@@ -683,6 +680,11 @@ void HTTPHandler::handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Ne
     setThreadName("HTTPHandler");
     ThreadStatus thread_status;
 
+    /// Should be initialized before anything,
+    /// For correct memory accounting.
+    Context context = server.context();
+    CurrentThread::QueryScope query_scope(context);
+
     Output used_output;
 
     /// In case of exception, send stack trace to client.
@@ -706,7 +708,7 @@ void HTTPHandler::handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Ne
             throw Exception("The Transfer-Encoding is not chunked and there is no Content-Length header for POST request", ErrorCodes::HTTP_LENGTH_REQUIRED);
         }
 
-        processQuery(request, params, response, used_output);
+        processQuery(context, request, params, response, used_output);
         LOG_INFO(log, "Done processing query");
     }
     catch (...)
diff --git a/src/Server/HTTPHandler.h b/src/Server/HTTPHandler.h
index b1a6355d281..be3fa6d4c4a 100644
--- a/src/Server/HTTPHandler.h
+++ b/src/Server/HTTPHandler.h
@@ -72,6 +72,7 @@ private:
 
     /// Also initializes 'used_output'.
     void processQuery(
+        Context & context,
         Poco::Net::HTTPServerRequest & request,
         HTMLForm & params,
         Poco::Net::HTTPServerResponse & response,