Merge pull request #20128 from apolcyn/fix_manby_grpclb_channel_stress_test_crash

Remove call from queued picks when failing it due to channel destruction
6 years ago · f78966eb52
parent 41771f2f47 aa2a65faed
commit f78966eb52
1 changed files with 1 additions and 0 deletions
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@ -3881,6 +3881,7 @@ void CallData::StartPickLocked(void* arg, grpc_error* error) {
        GRPC_ERROR_UNREF(result.error);
        GRPC_CLOSURE_SCHED(&calld->pick_closure_,
                           GRPC_ERROR_REF(disconnect_error));
+        if (calld->pick_queued_) calld->RemoveCallFromQueuedPicksLocked(elem);
        break;
      }
      // If wait_for_ready is false, then the error indicates the RPC