From b5ee1cdcb94fde937f84346eedc1efe2a25a373b Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 13 Jul 2016 08:39:35 -0700
Subject: [PATCH] Dont stall shutting down server

---
 test/cpp/qps/server_async.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();
     }
-- 
GitLab