diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-17 07:03:54 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-17 07:03:54 -0800 |
| commit | 65d57b8c3d83c3245dbe864c46b1056a1c99ddcc (patch) | |
| tree | 3f3029cfe6c1b1097f4b24b04af26a1cf537c87e /src/core/ext/lb_policy/grpclb | |
| parent | 6f4178878ccc45f365ce72eef6247315e048cf2a (diff) | |
| parent | 46ca4f7d4eca6cb69a6d80ce35f58f2325cf945d (diff) | |
Merge github.com:grpc/grpc into zalloc
Diffstat (limited to 'src/core/ext/lb_policy/grpclb')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index 4b3c425428..d60aab8d6a 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -488,9 +488,8 @@ static grpc_lb_addresses *process_serverlist_locked( static bool update_lb_connectivity_status_locked( grpc_exec_ctx *exec_ctx, glb_lb_policy *glb_policy, grpc_connectivity_state new_rr_state, grpc_error *new_rr_state_error) { - grpc_error *curr_state_error; - const grpc_connectivity_state curr_glb_state = grpc_connectivity_state_check( - &glb_policy->state_tracker, &curr_state_error); + const grpc_connectivity_state curr_glb_state = + grpc_connectivity_state_check(&glb_policy->state_tracker); /* The new connectivity status is a function of the previous one and the new * input coming from the status of the RR policy. @@ -1091,8 +1090,8 @@ static grpc_connectivity_state glb_check_connectivity( glb_lb_policy *glb_policy = (glb_lb_policy *)pol; grpc_connectivity_state st; gpr_mu_lock(&glb_policy->mu); - st = grpc_connectivity_state_check(&glb_policy->state_tracker, - connectivity_error); + st = grpc_connectivity_state_get(&glb_policy->state_tracker, + connectivity_error); gpr_mu_unlock(&glb_policy->mu); return st; } |