diff options
author | Juanli Shen <aspirinsjl@gmail.com> | 2018-02-15 09:42:45 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-15 09:42:45 -0800 |
commit | 87c6504ca975abcee0f86fe670b843c8a08c50fb (patch) | |
tree | 5a212a0a858ef634c7d63fd538dd9bd7c698268e /src/core/ext/filters/client_channel/lb_policy.cc | |
parent | 55f95df764721e7411b00d4b462025a6851d1dcb (diff) |
Revert "Revert "Revert "Revert "grpclb re-resolution""""
Diffstat (limited to 'src/core/ext/filters/client_channel/lb_policy.cc')
-rw-r--r-- | src/core/ext/filters/client_channel/lb_policy.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy.cc b/src/core/ext/filters/client_channel/lb_policy.cc index cc4fe7ec62..27fb2ad1f4 100644 --- a/src/core/ext/filters/client_channel/lb_policy.cc +++ b/src/core/ext/filters/client_channel/lb_policy.cc @@ -118,7 +118,8 @@ void grpc_lb_policy_update_locked(grpc_lb_policy* policy, void grpc_lb_policy_set_reresolve_closure_locked( grpc_lb_policy* policy, grpc_closure* request_reresolution) { - policy->vtable->set_reresolve_closure_locked(policy, request_reresolution); + GPR_ASSERT(policy->request_reresolution == nullptr); + policy->request_reresolution = request_reresolution; } void grpc_lb_policy_try_reresolve(grpc_lb_policy* policy, @@ -133,8 +134,8 @@ void grpc_lb_policy_try_reresolve(grpc_lb_policy* policy, grpc_lb_trace->name(), policy, grpc_error_string(error)); } } else { - if (grpc_lb_trace->enabled() && error == GRPC_ERROR_NONE) { - gpr_log(GPR_DEBUG, "%s %p: re-resolution already in progress.", + if (grpc_lb_trace->enabled()) { + gpr_log(GPR_DEBUG, "%s %p: no available re-resolution closure.", grpc_lb_trace->name(), policy); } } |