From 452fb4a67b2efd50b1b4b83b7e2d04658b260b03 Mon Sep 17 00:00:00 2001 From: Juanli Shen Date: Wed, 30 Jan 2019 15:10:51 -0800 Subject: [PATCH] Unify parameter name --- src/core/ext/filters/client_channel/subchannel.cc | 8 ++++---- src/core/ext/filters/client_channel/subchannel.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 70285659aad..1d188a655f8 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -731,10 +731,10 @@ channelz::SubchannelNode* Subchannel::channelz_node() { } grpc_connectivity_state Subchannel::CheckConnectivity( - grpc_error** error, bool inhibit_health_checks) { + grpc_error** error, bool inhibit_health_checking) { MutexLock lock(&mu_); grpc_connectivity_state_tracker* tracker = - inhibit_health_checks ? &state_tracker_ : &state_and_health_tracker_; + inhibit_health_checking ? &state_tracker_ : &state_and_health_tracker_; grpc_connectivity_state state = grpc_connectivity_state_get(tracker, error); return state; } @@ -742,9 +742,9 @@ grpc_connectivity_state Subchannel::CheckConnectivity( void Subchannel::NotifyOnStateChange(grpc_pollset_set* interested_parties, grpc_connectivity_state* state, grpc_closure* notify, - bool inhibit_health_checks) { + bool inhibit_health_checking) { grpc_connectivity_state_tracker* tracker = - inhibit_health_checks ? &state_tracker_ : &state_and_health_tracker_; + inhibit_health_checking ? &state_tracker_ : &state_and_health_tracker_; ExternalStateWatcher* w; if (state == nullptr) { MutexLock lock(&mu_); diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index 88282c9d95e..47c21ff8680 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -213,7 +213,7 @@ class Subchannel { // invokes \a notify and updates \a *state with the new state. void NotifyOnStateChange(grpc_pollset_set* interested_parties, grpc_connectivity_state* state, grpc_closure* notify, - bool inhibit_health_checks); + bool inhibit_health_checking); // Resets the connection backoff of the subchannel. // TODO(roth): Move connection backoff out of subchannels and up into LB