Merge pull request #3441 from CurtizJ/CLICKHOUSE-1834

Setting for TCP keepalive. [CLICKHOUSE-1834]
ClickHouse · Oct 23, 2018 · 10abde5 · 10abde5
2 parents 2da78ae + 7963e95
commit 10abde5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/dbms/programs/client/ConnectionParameters.h b/dbms/programs/client/ConnectionParameters.h
@@ -76,7 +76,8 @@ struct ConnectionParameters
         timeouts = ConnectionTimeouts(
             Poco::Timespan(config.getInt("connect_timeout", DBMS_DEFAULT_CONNECT_TIMEOUT_SEC), 0),
             Poco::Timespan(config.getInt("receive_timeout", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0),
-            Poco::Timespan(config.getInt("send_timeout", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0));
+            Poco::Timespan(config.getInt("send_timeout", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0),
+            Poco::Timespan(config.getInt("tcp_keep_alive_timeout", 0), 0));
     }
 };
 

diff --git a/dbms/src/Client/Connection.cpp b/dbms/src/Client/Connection.cpp
@@ -77,6 +77,11 @@ void Connection::connect()
         socket->setReceiveTimeout(timeouts.receive_timeout);
         socket->setSendTimeout(timeouts.send_timeout);
         socket->setNoDelay(true);
+        if (timeouts.tcp_keep_alive_timeout.totalSeconds())
+        {
+            socket->setKeepAlive(true);
+            socket->setOption(SOL_TCP, TCP_KEEPIDLE, timeouts.tcp_keep_alive_timeout);
+        }
 
         in = std::make_shared<ReadBufferFromPocoSocket>(*socket);
         out = std::make_shared<WriteBufferFromPocoSocket>(*socket);

diff --git a/dbms/src/IO/ConnectionTimeouts.h b/dbms/src/IO/ConnectionTimeouts.h
@@ -11,6 +11,7 @@ struct ConnectionTimeouts
     Poco::Timespan connection_timeout;
     Poco::Timespan send_timeout;
     Poco::Timespan receive_timeout;
+    Poco::Timespan tcp_keep_alive_timeout;
 
     ConnectionTimeouts() = default;
 
@@ -19,7 +20,19 @@ struct ConnectionTimeouts
                        const Poco::Timespan & receive_timeout_)
     : connection_timeout(connection_timeout_),
       send_timeout(send_timeout_),
-      receive_timeout(receive_timeout_)
+      receive_timeout(receive_timeout_),
+      tcp_keep_alive_timeout(0)
+    {
+    }
+
+    ConnectionTimeouts(const Poco::Timespan & connection_timeout_,
+                       const Poco::Timespan & send_timeout_,
+                       const Poco::Timespan & receive_timeout_,
+                       const Poco::Timespan & tcp_keep_alive_timeout_)
+    : connection_timeout(connection_timeout_),
+      send_timeout(send_timeout_),
+      receive_timeout(receive_timeout_),
+      tcp_keep_alive_timeout(tcp_keep_alive_timeout_)
     {
     }
 
@@ -35,19 +48,20 @@ struct ConnectionTimeouts
     {
         return ConnectionTimeouts(saturate(connection_timeout, limit),
                                   saturate(send_timeout, limit),
-                                  saturate(receive_timeout, limit));
+                                  saturate(receive_timeout, limit),
+                                  saturate(tcp_keep_alive_timeout, limit));
     }
 
     /// Timeouts for the case when we have just single attempt to connect.
     static ConnectionTimeouts getTCPTimeoutsWithoutFailover(const Settings & settings)
     {
-        return ConnectionTimeouts(settings.connect_timeout, settings.send_timeout, settings.receive_timeout);
+        return ConnectionTimeouts(settings.connect_timeout, settings.send_timeout, settings.receive_timeout, settings.tcp_keep_alive_timeout);
     }
 
     /// Timeouts for the case when we will try many addresses in a loop.
     static ConnectionTimeouts getTCPTimeoutsWithFailover(const Settings & settings)
     {
-        return ConnectionTimeouts(settings.connect_timeout_with_failover_ms, settings.send_timeout, settings.receive_timeout);
+        return ConnectionTimeouts(settings.connect_timeout_with_failover_ms, settings.send_timeout, settings.receive_timeout, settings.tcp_keep_alive_timeout);
     }
 
     static ConnectionTimeouts getHTTPTimeouts(const Settings & settings)

diff --git a/dbms/src/Interpreters/Settings.h b/dbms/src/Interpreters/Settings.h
@@ -49,6 +49,7 @@ struct Settings
     M(SettingMilliseconds, connect_timeout_with_failover_ms, DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_MS, "Connection timeout for selecting first healthy replica.") \
     M(SettingSeconds, receive_timeout, DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, "") \
     M(SettingSeconds, send_timeout, DBMS_DEFAULT_SEND_TIMEOUT_SEC, "") \
+    M(SettingSeconds, tcp_keep_alive_timeout, 0, "") \
     M(SettingMilliseconds, queue_max_wait_ms, 5000, "The wait time in the request queue, if the number of concurrent requests exceeds the maximum.") \
     M(SettingUInt64, poll_interval, DBMS_DEFAULT_POLL_INTERVAL, "Block at the query wait loop on the server for the specified number of seconds.") \
     M(SettingUInt64, distributed_connections_pool_size, DBMS_DEFAULT_DISTRIBUTED_CONNECTIONS_POOL_SIZE, "Maximum number of connections with one remote server in the pool.") \