Resolved merge conflicts with master

1 files changed, 22 insertions, 0 deletions

diff --git a/src/node/ext/completion_queue_async_worker.cc b/src/node/ext/completion_queue_async_worker.cc
index 3a79f7c45d..619ea41515 100644
--- a/src/node/ext/completion_queue_async_worker.cc
+++ b/src/node/ext/completion_queue_async_worker.cc
@@ -52,6 +52,9 @@ using v8::Value;
 
 grpc_completion_queue *CompletionQueueAsyncWorker::queue;
 
+// Invariants: current_threads <= max_queue_threads
+// (current_threads == max_queue_threads) || (waiting_next_calls == 0)
+
 int CompletionQueueAsyncWorker::current_threads;
 int CompletionQueueAsyncWorker::waiting_next_calls;
 
@@ -73,11 +76,15 @@ grpc_completion_queue *CompletionQueueAsyncWorker::GetQueue() { return queue; }
 void CompletionQueueAsyncWorker::Next() {
   Nan::HandleScope scope;
   if (current_threads < max_queue_threads) {
+    current_threads += 1;
     CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
     Nan::AsyncQueueWorker(worker);
   } else {
     waiting_next_calls += 1;
   }
+  GPR_ASSERT(current_threads <= max_queue_threads);
+  GPR_ASSERT((current_threads == max_queue_threads) ||
+             (waiting_next_calls == 0));
 }
 
 void CompletionQueueAsyncWorker::Init(Local<Object> exports) {
@@ -91,11 +98,15 @@ void CompletionQueueAsyncWorker::HandleOKCallback() {
   Nan::HandleScope scope;
   if (waiting_next_calls > 0) {
     waiting_next_calls -= 1;
+    // Old worker removed, new worker added. current_threads += 0
     CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
     Nan::AsyncQueueWorker(worker);
   } else {
     current_threads -= 1;
   }
+  GPR_ASSERT(current_threads <= max_queue_threads);
+  GPR_ASSERT((current_threads == max_queue_threads) ||
+             (waiting_next_calls == 0));
   Nan::Callback *callback = GetTagCallback(result.tag);
   Local<Value> argv[] = {Nan::Null(), GetTagNodeValue(result.tag)};
   callback->Call(2, argv);
@@ -104,6 +115,17 @@ void CompletionQueueAsyncWorker::HandleOKCallback() {
 }
 
 void CompletionQueueAsyncWorker::HandleErrorCallback() {
+  if (waiting_next_calls > 0) {
+    waiting_next_calls -= 1;
+    // Old worker removed, new worker added. current_threads += 0
+    CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
+    Nan::AsyncQueueWorker(worker);
+  } else {
+    current_threads -= 1;
+  }
+  GPR_ASSERT(current_threads <= max_queue_threads);
+  GPR_ASSERT((current_threads == max_queue_threads) ||
+             (waiting_next_calls == 0));
   Nan::HandleScope scope;
   Nan::Callback *callback = GetTagCallback(result.tag);
   Local<Value> argv[] = {Nan::Error(ErrorMessage())};