From e67f7b6b5424fe398e675d5d6ce8c4a0949da7e0 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 23 May 2016 14:50:24 -0700 Subject: Fix timeout on async server shutdown Server was continuing to make requests for new calls forever, which were starving out the shutdown sequence. Change order and win. --- test/cpp/qps/server_async.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/cpp/qps') diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 1234542687..1eddb1dc1d 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -131,10 +131,10 @@ class AsyncQpsServerTest : public Server { } } ~AsyncQpsServerTest() { - server_->Shutdown(); for (auto ss = shutdown_state_.begin(); ss != shutdown_state_.end(); ++ss) { (*ss)->set_shutdown(); } + server_->Shutdown(); for (auto thr = threads_.begin(); thr != threads_.end(); thr++) { thr->join(); } -- cgit v1.2.3