From 92d37b1273bff03156803f8431903461c799983c Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Sat, 2 Feb 2019 09:14:05 -0800
Subject: [PATCH] SOFT_MAXIMUM is supposed to be per-server, not per-method

---
 src/cpp/server/server_cc.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 21f84de5c1e..05f78dbe6fe 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -444,7 +444,8 @@ class Server::CallbackRequest final : public internal::CompletionQueueTag {
       // If this was the last request in the list or it is below the soft
       // minimum and there are spare requests available, set up a new one.
       if (count == 0 || (count < SOFT_MINIMUM_SPARE_CALLBACK_REQS_PER_METHOD &&
-                         count < SOFT_MAXIMUM_CALLBACK_REQS_OUTSTANDING)) {
+                         req_->server_->callback_reqs_outstanding_ <
+                             SOFT_MAXIMUM_CALLBACK_REQS_OUTSTANDING)) {
         auto* new_req = new CallbackRequest(req_->server_, req_->method_index_,
                                             req_->method_, req_->method_tag_);
         if (!new_req->Request()) {