Merge pull request #7351 from Enmk/http_keep_alive_timeout

akuzm · web-flow · commit 3e662da6f4cc · 2019-10-17T16:14:29.000+03:00
Fixed issue of using HTTP timeout as TCP timeout value.
diff --git a/dbms/src/IO/ConnectionTimeouts.h b/dbms/src/IO/ConnectionTimeouts.h
@@ -89,7 +89,7 @@ struct ConnectionTimeouts
         const auto & settings = context.getSettingsRef();
         const auto & config = context.getConfigRef();
         Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 10), 0};
-        return ConnectionTimeouts(settings.http_connection_timeout, settings.http_send_timeout, settings.http_receive_timeout, http_keep_alive_timeout);
+        return ConnectionTimeouts(settings.http_connection_timeout, settings.http_send_timeout, settings.http_receive_timeout, settings.tcp_keep_alive_timeout, http_keep_alive_timeout);
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ struct ConnectionTimeouts`
`89`	`89`	`const auto & settings = context.getSettingsRef();`
`90`	`90`	`const auto & config = context.getConfigRef();`
`91`	`91`	`Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 10), 0};`
`92`		`- return ConnectionTimeouts(settings.http_connection_timeout, settings.http_send_timeout, settings.http_receive_timeout, http_keep_alive_timeout);`
	`92`	`+ return ConnectionTimeouts(settings.http_connection_timeout, settings.http_send_timeout, settings.http_receive_timeout, settings.tcp_keep_alive_timeout, http_keep_alive_timeout);`
`93`	`93`	`}`
`94`	`94`	`};`
`95`	`95`