diff options
author | Noah Eisen <ncteisen@gmail.com> | 2018-12-06 09:00:14 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-06 09:00:14 -0800 |
commit | 8ba8dadcc924296a120ce50329cd08fdfec6aec6 (patch) | |
tree | f8be0e7a9677337011eecd63fd492f9682cdba67 | |
parent | 3a0fde868e966100e2b8b26f48b1719c995c4c5a (diff) | |
parent | 7cb0290d9cec348eb0dde9c6661d78b77ac7b0f6 (diff) |
Merge pull request #17424 from ncteisen/channelz-off-by-one
Fix off by one error in channelz
-rw-r--r-- | src/core/lib/channel/channelz.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc index 8d589f5983..0802143fbe 100644 --- a/src/core/lib/channel/channelz.cc +++ b/src/core/lib/channel/channelz.cc @@ -208,11 +208,7 @@ char* ServerNode::RenderServerSockets(intptr_t start_socket_id) { grpc_json* json = top_level_json; grpc_json* json_iterator = nullptr; ChildRefsList socket_refs; - // uuids index into entities one-off (idx 0 is really uuid 1, since 0 is - // reserved). However, we want to support requests coming in with - // start_server_id=0, which signifies "give me everything." - size_t start_idx = start_socket_id == 0 ? 0 : start_socket_id - 1; - grpc_server_populate_server_sockets(server_, &socket_refs, start_idx); + grpc_server_populate_server_sockets(server_, &socket_refs, start_socket_id); if (!socket_refs.empty()) { // create list of socket refs grpc_json* array_parent = grpc_json_create_child( |