thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

On shutdown wait 5 seconds to complete queries

Browse Source
This commit is contained in:
proller 2017-03-28 19:23:18 +03:00 committed by alexey-milovidov
parent c90709b38e
commit 6b9cdd585a
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dbms/src/Server/Server.cpp
View File

@ -457,11 +457,10 @@ int Server::main(const std::vector<std::string> & args)
)
{
LOG_ERROR(log,
"Cannot resolve listen_host (" << host << "), error: " << e.message()
<< ". "
"If it is an IPv6 address and your host has disabled IPv6, then consider to "
"specify IPv4 address to listen in <listen_host> element of configuration "
"file. Example: <listen_host>0.0.0.0</listen_host>");
"Cannot resolve listen_host (" << host << "), error: " << e.message() << ". "
<< "If it is an IPv6 address and your host has disabled IPv6, then consider to "
<< "specify IPv4 address to listen in <listen_host> element of configuration "
<< "file. Example: <listen_host>0.0.0.0</listen_host>");
}
throw;
@ -562,7 +561,23 @@ int Server::main(const std::vector<std::string> & args)
for (auto & server : servers)
server->stop();
LOG_DEBUG(log, "Closed all connections.");
const int sleep_max_ms = 1000 * config().getInt("shutdown_wait_unfinished", 5);
const int sleep_one_ms = 100;
int sleep_current_ms = 0;
int current_connections = 0;
while (sleep_current_ms < sleep_max_ms)
{
current_connections = 0;
for (auto & server : servers)
current_connections += server->currentConnections();
if (!current_connections)
break;
sleep_current_ms += sleep_one_ms;
std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
}
LOG_DEBUG(
log, "Closed all connections." << (current_connections ? " But " + std::to_string(current_connections) + " remains." : ""));
main_config_reloader.reset();
users_config_reloader.reset();
@ -594,7 +609,6 @@ int Server::main(const std::vector<std::string> & args)
metrics_transmitters.emplace_back(std::make_unique<MetricsTransmitter>(async_metrics, graphite_key));
}
waitForTerminationRequest();
}