From 134efcd7edfe387b752ac44cac1bc219f2c6f5c1 Mon Sep 17 00:00:00 2001 From: Vitaliy Lyudvichenko Date: Thu, 29 Mar 2018 16:33:48 +0300 Subject: [PATCH] Swapped send and receive timeouts settings from client. [#CLICKHOUSE-2] --- dbms/src/Server/TCPHandler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dbms/src/Server/TCPHandler.cpp b/dbms/src/Server/TCPHandler.cpp index 425f9974df..72caa5ffe5 100644 --- a/dbms/src/Server/TCPHandler.cpp +++ b/dbms/src/Server/TCPHandler.cpp @@ -608,8 +608,10 @@ void TCPHandler::receiveQuery() settings.deserialize(*in); /// Sync timeouts on client and server during current query to avoid dangling queries on server + /// NOTE: We use settings.send_timeout for the receive timeout and vice versa (change arguments ordering in TimeoutSetter), + /// because settings.send_timeout is client-side setting which has opposite meaning on the server side. /// NOTE: these settings are applied only for current connection (not for distributed tables' connections) - state.timeout_setter = std::make_unique(socket(), settings.send_timeout, settings.receive_timeout); + state.timeout_setter = std::make_unique(socket(), settings.receive_timeout, settings.send_timeout); readVarUInt(stage, *in); state.stage = QueryProcessingStage::Enum(stage); -- GitLab