aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/qps
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-07-13 08:39:35 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-07-13 08:39:35 -0700
commitb5ee1cdcb94fde937f84346eedc1efe2a25a373b (patch)
tree1b723413618224f5b0421639ccada7bd8fe31ec3 /test/cpp/qps
parent38fb8de100afacbf4c9c00b7f51bfcc763bf366a (diff)
Dont stall shutting down server
Diffstat (limited to 'test/cpp/qps')
-rw-r--r--test/cpp/qps/server_async.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index 298b9d537f..73ca19148b 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@@ -132,7 +132,8 @@ class AsyncQpsServerTest : public Server {
for (auto ss = shutdown_state_.begin(); ss != shutdown_state_.end(); ++ss) {
(*ss)->set_shutdown();
}
- server_->Shutdown();
+ server_->Shutdown(std::chrono::system_clock::now() +
+ std::chrono::seconds(3));
for (auto thr = threads_.begin(); thr != threads_.end(); thr++) {
thr->join();
}