From 8db6f9b16ba954e15b232ead2670dd92fe0b3c01 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Fri, 20 Oct 2017 13:21:52 -0700 Subject: Removed wrong assert from grpclb --- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index ffd58129c6..71d5bfec98 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -1805,7 +1805,6 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx *exec_ctx, case GRPC_CHANNEL_IDLE: // lb channel inactive (probably shutdown prior to update). Restart lb // call to kick the lb channel into gear. - GPR_ASSERT(glb_policy->lb_call == NULL); /* fallthrough */ case GRPC_CHANNEL_READY: if (glb_policy->lb_call != NULL) { -- cgit v1.2.3 From 2b217d41c4c8cb4269b569591141b0d88ff9a9a2 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Fri, 20 Oct 2017 15:56:30 -0700 Subject: clang-format --- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 71d5bfec98..e159188ad7 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -1803,8 +1803,8 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx *exec_ctx, break; } case GRPC_CHANNEL_IDLE: - // lb channel inactive (probably shutdown prior to update). Restart lb - // call to kick the lb channel into gear. + // lb channel inactive (probably shutdown prior to update). Restart lb + // call to kick the lb channel into gear. /* fallthrough */ case GRPC_CHANNEL_READY: if (glb_policy->lb_call != NULL) { -- cgit v1.2.3