diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-10-04 16:06:19 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-10-04 16:06:19 -0700 |
| commit | 867192e29e15fab9e3d8052ecb8b31d9177b24cf (patch) | |
| tree | c1cbdc5ef8a2154bcbeee9ba700201ed04d985ab /src/core/ext/filters/client_channel/subchannel.cc | |
| parent | a64cb54de152017d6c3c968ec9c22a98c405a8ba (diff) | |
| parent | fbbf4593d69823b1a3d75e910c714a783116648f (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-trace-size
Diffstat (limited to 'src/core/ext/filters/client_channel/subchannel.cc')
| -rw-r--r-- | src/core/ext/filters/client_channel/subchannel.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 53954ea2d0..4a668b0fa7 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -388,10 +388,12 @@ grpc_subchannel* grpc_subchannel_create(grpc_connector* connector, const grpc_arg* arg = grpc_channel_args_find(c->args, GRPC_ARG_ENABLE_CHANNELZ); - bool channelz_enabled = grpc_channel_arg_get_bool(arg, false); + 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_EVENT_MEMORY_PER_NODE); - const grpc_integer_options options = {0, 0, INT_MAX}; + const grpc_integer_options options = { + 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) { |