diff options
author | 2018-10-05 12:15:48 -0700 | |
---|---|---|
committer | 2018-10-05 12:15:48 -0700 | |
commit | f526602bff029b8db50a8d57134d72da33d8a752 (patch) | |
tree | ceb35cb56043af3e7352da096d94de43e461d8a6 /src/core/ext/filters/client_channel | |
parent | 5159d8bacd6159aaf9f052f9bbe253f1d6027b5a (diff) | |
parent | 6f6033c91019709c601f90d84617f07f8374699e (diff) |
Merge pull request #16767 from ncteisen/channel-trace-size
Limit Channel Trace by Memory
Diffstat (limited to 'src/core/ext/filters/client_channel')
-rw-r--r-- | src/core/ext/filters/client_channel/subchannel.cc | 10 |
1 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 088c9d6c00..4a668b0fa7 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -390,16 +390,16 @@ grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, grpc_channel_args_find(c->args, GRPC_ARG_ENABLE_CHANNELZ); bool channelz_enabled = grpc_channel_arg_get_bool(arg, GRPC_ENABLE_CHANNELZ_DEFAULT); - arg = grpc_channel_args_find(c->args, - GRPC_ARG_MAX_CHANNEL_TRACE_EVENTS_PER_NODE); + arg = grpc_channel_args_find( + c->args, GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE); const grpc_integer_options options = { - GRPC_MAX_CHANNEL_TRACE_EVENTS_PER_NODE_DEFAULT, 0, INT_MAX}; - size_t channel_tracer_max_nodes = + GRPC_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE_DEFAULT, 0, INT_MAX}; + size_t channel_tracer_max_memory = (size_t)grpc_channel_arg_get_integer(arg, options); if (channelz_enabled) { c->channelz_subchannel = grpc_core::MakeRefCounted<grpc_core::channelz::SubchannelNode>( - c, channel_tracer_max_nodes); + c, channel_tracer_max_memory); c->channelz_subchannel->AddTraceEvent( grpc_core::channelz::ChannelTrace::Severity::Info, grpc_slice_from_static_string("Subchannel created")); |