Merge pull request #10684 from ClickHouse/fix_7939

alexey-milovidov · web-flow · commit 75b0303903b0 · 2020-05-06T23:01:45.000+03:00
Fix http readonly request stucks on client close
diff --git a/programs/server/HTTPHandler.cpp b/programs/server/HTTPHandler.cpp
@@ -567,7 +567,6 @@ void HTTPHandler::processQuery(
             try
             {
                 char b;
-                //FIXME looks like MSG_DONTWAIT is useless because of POCO_BROKEN_TIMEOUTS
                 int status = socket.receiveBytes(&b, 1, MSG_DONTWAIT | MSG_PEEK);
                 if (status == 0)
                     context.killCurrentQuery();
diff --git a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
@@ -10,3 +10,10 @@ do
     ${CLICKHOUSE_CURL} -sS --data "SELECT count() FROM system.processes WHERE query_id = 'cancel_http_readonly_queries_on_client_close'" "${CLICKHOUSE_URL}" | grep '0' && break
     sleep 0.2
 done
+
+${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&session_id=test_00834_session&readonly=2&cancel_http_readonly_queries_on_client_close=1" -d "CREATE TEMPORARY TABLE table_tmp AS SELECT 1 FORMAT JSON"
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&session_id=test_00834_session&query=DROP+TEMPORARY+TABLE+table_tmp"
+
+url_https="https://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTPS}/?session_id=test_00834_session"
+${CLICKHOUSE_CURL} -sSk -X POST "$url_https&readonly=2&cancel_http_readonly_queries_on_client_close=1" -d "CREATE TEMPORARY TABLE table_tmp AS SELECT 1 FORMAT JSON"
+${CLICKHOUSE_CURL} -sSk "$url_https&session_id=test_00834_session&query=DROP+TEMPORARY+TABLE+table_tmp"

Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,6 @@ void HTTPHandler::processQuery(`
`567`	`567`	`try`
`568`	`568`	`{`
`569`	`569`	`char b;`
`570`		`- //FIXME looks like MSG_DONTWAIT is useless because of POCO_BROKEN_TIMEOUTS`
`571`	`570`	`int status = socket.receiveBytes(&b, 1, MSG_DONTWAIT \| MSG_PEEK);`
`572`	`571`	`if (status == 0)`
`573`	`572`	`context.killCurrentQuery();`