diff options
| author |  Noah Eisen <ncteisen@gmail.com> | 2018-10-15 17:12:10 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-10-15 17:12:10 -0400 |
| commit | 302c89e047c5f812aec018854f2ea4c442ac42d1 (patch) | |
| tree | 02801bfc2e7c60ce2494b5602bb5a643b7c5986a /src | |
| parent | fe431b4d8ad24c2fc9981f4b9fc28ab75020c410 (diff) | |
| parent | 247b5b70c4d85ea23179d8e5231e7a98498e98ca (diff) | |
Merge pull request #16819 from ncteisen/channelz
Channelz Part 9: Enable by Default
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/channel/channelz.h | 4 | ||||
| -rw-r--r-- | src/python/grpcio_tests/commands.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h index fddef793fb..88551befc8 100644 --- a/src/core/lib/channel/channelz.h +++ b/src/core/lib/channel/channelz.h @@ -42,13 +42,13 @@ /** This is the default value for whether or not to enable channelz. If * GRPC_ARG_ENABLE_CHANNELZ is set, it will override this default value. */ -#define GRPC_ENABLE_CHANNELZ_DEFAULT false +#define GRPC_ENABLE_CHANNELZ_DEFAULT true /** This is the default value for the maximum amount of memory used by trace * events per channel trace node. If * GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE is set, it will override * this default value. */ -#define GRPC_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE_DEFAULT 0 +#define GRPC_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE_DEFAULT 1024 * 4 namespace grpc_core { diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index 0dfbf3180b..6931d93ef0 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -116,6 +116,8 @@ class TestGevent(setuptools.Command): # eventually succeed, but need to dig into performance issues. 'unit._cython._no_messages_server_completion_queue_per_call_test.Test.test_rpcs', 'unit._cython._no_messages_single_server_completion_queue_test.Test.test_rpcs', + # TODO(https://github.com/grpc/grpc/issues/16890) enable this test + 'unit._cython._channel_test.ChannelTest.test_multiple_channels_lonely_connectivity', # I have no idea why this doesn't work in gevent, but it shouldn't even be # using the c-core 'testing._client_test.ClientTest.test_infinite_request_stream_real_time', |