Respond to reviewer comments

pull/19714/head
Hope Casey-Allen 6 years ago
parent 81013e54d3
commit 64ead823c3
  1. 3
      src/core/ext/filters/client_channel/client_channel.cc
  2. 17
      src/core/lib/channel/channelz.cc
  3. 21
      src/core/lib/channel/channelz.h

@ -733,7 +733,8 @@ class ChannelData::ConnectivityStateAndPickerSetter {
chand->channelz_node_->AddTraceEvent(
channelz::ChannelTrace::Severity::Info,
grpc_slice_from_static_string(
channelz::GetChannelConnectivityStateChangeString(state)));
channelz::ChannelNode::GetChannelConnectivityStateChangeString(
state)));
}
// Bounce into the data plane combiner to reset the picker.
GRPC_CHANNEL_STACK_REF(chand->owning_stack_,

@ -192,6 +192,23 @@ ChannelNode::ChannelNode(UniquePtr<char> target,
trace_(channel_tracer_max_nodes),
parent_uuid_(parent_uuid) {}
const char* ChannelNode::GetChannelConnectivityStateChangeString(
grpc_connectivity_state state) {
switch (state) {
case GRPC_CHANNEL_IDLE:
return "Channel state change to IDLE";
case GRPC_CHANNEL_CONNECTING:
return "Channel state change to CONNECTING";
case GRPC_CHANNEL_READY:
return "Channel state change to READY";
case GRPC_CHANNEL_TRANSIENT_FAILURE:
return "Channel state change to TRANSIENT_FAILURE";
case GRPC_CHANNEL_SHUTDOWN:
return "Channel state change to SHUTDOWN";
}
GPR_UNREACHABLE_CODE(return "UNKNOWN");
}
grpc_json* ChannelNode::RenderJson() {
// We need to track these three json objects to build our object
grpc_json* top_level_json = grpc_json_create(GRPC_JSON_OBJECT);

@ -70,23 +70,6 @@ class CallCountingHelperPeer;
class ChannelNodePeer;
} // namespace testing
inline static const char* GetChannelConnectivityStateChangeString(
grpc_connectivity_state state) {
switch (state) {
case GRPC_CHANNEL_IDLE:
return "Channel state change to IDLE";
case GRPC_CHANNEL_CONNECTING:
return "Channel state change to CONNECTING";
case GRPC_CHANNEL_READY:
return "Channel state change to READY";
case GRPC_CHANNEL_TRANSIENT_FAILURE:
return "Channel state change to TRANSIENT_FAILURE";
case GRPC_CHANNEL_SHUTDOWN:
return "Channel state change to SHUTDOWN";
}
GPR_UNREACHABLE_CODE(return "UNKNOWN");
}
// base class for all channelz entities
class BaseNode : public RefCounted<BaseNode> {
public:
@ -170,6 +153,10 @@ class ChannelNode : public BaseNode {
ChannelNode(UniquePtr<char> target, size_t channel_tracer_max_nodes,
intptr_t parent_uuid);
// Returns the string description of the given connectivity state.
static const char* GetChannelConnectivityStateChangeString(
grpc_connectivity_state state);
intptr_t parent_uuid() const { return parent_uuid_; }
grpc_json* RenderJson() override;

Loading…
Cancel
Save