From c8ee12c0f5bdb76d12f4c20c42144383e8a669fb Mon Sep 17 00:00:00 2001 From: ncteisen Date: Fri, 2 Nov 2018 16:48:09 -0400 Subject: [PATCH 1/4] Reset json pointer --- src/core/lib/channel/channelz.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc index b31ab41f6ad..8d589f5983e 100644 --- a/src/core/lib/channel/channelz.cc +++ b/src/core/lib/channel/channelz.cc @@ -449,6 +449,7 @@ grpc_json* ListenSocketNode::RenderJson() { json_iterator = nullptr; json_iterator = grpc_json_add_number_string_child(json, json_iterator, "socketId", uuid()); + json = top_level_json; PopulateSocketAddressJson(json, "local", local_addr_.get()); return top_level_json; From 131eedaa408be824d0ff222e6b6fcb64f82f5495 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Fri, 2 Nov 2018 16:55:06 -0400 Subject: [PATCH 2/4] Add test --- test/cpp/end2end/channelz_service_test.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 5f252785348..24b00e849a2 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -650,6 +650,28 @@ TEST_F(ChannelzServerTest, GetServerSocketsTest) { EXPECT_TRUE(s.ok()) << "s.error_message() = " << s.error_message(); EXPECT_EQ(get_server_sockets_response.socket_ref_size(), 1); } +TEST_F(ChannelzServerTest, GetServerListenSocketsTest) { + ResetStubs(); + ConfigureProxy(1); + GetServersRequest get_server_request; + GetServersResponse get_server_response; + get_server_request.set_start_server_id(0); + ClientContext get_server_context; + Status s = channelz_stub_->GetServers(&get_server_context, get_server_request, + &get_server_response); + EXPECT_TRUE(s.ok()) << "s.error_message() = " << s.error_message(); + EXPECT_EQ(get_server_response.server_size(), 1); + EXPECT_EQ(get_server_response.server(0).listen_socket_size(), 1); + GetSocketRequest get_socket_request; + GetSocketResponse get_socket_response; + get_socket_request.set_socket_id( + get_server_response.server(0).listen_socket(0).socket_id()); + ClientContext get_socket_context; + s = channelz_stub_->GetSocket(&get_socket_context, + get_socket_request, + &get_socket_response); + EXPECT_TRUE(s.ok()) << "s.error_message() = " << s.error_message(); +} } // namespace testing } // namespace grpc From e7d59f718fc715f4de231645b6fe60ef512a0eff Mon Sep 17 00:00:00 2001 From: ncteisen Date: Fri, 2 Nov 2018 16:56:12 -0400 Subject: [PATCH 3/4] clang format --- test/cpp/end2end/channelz_service_test.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 24b00e849a2..8672f8083d0 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -667,9 +667,8 @@ TEST_F(ChannelzServerTest, GetServerListenSocketsTest) { get_socket_request.set_socket_id( get_server_response.server(0).listen_socket(0).socket_id()); ClientContext get_socket_context; - s = channelz_stub_->GetSocket(&get_socket_context, - get_socket_request, - &get_socket_response); + s = channelz_stub_->GetSocket(&get_socket_context, get_socket_request, + &get_socket_response); EXPECT_TRUE(s.ok()) << "s.error_message() = " << s.error_message(); } From 1b8bf9f190fe53bdb8fb0e5d78f7e84d7547ba63 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Fri, 2 Nov 2018 17:22:59 -0400 Subject: [PATCH 4/4] Add blank line --- test/cpp/end2end/channelz_service_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 8672f8083d0..f04ffe4f2d5 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -650,6 +650,7 @@ TEST_F(ChannelzServerTest, GetServerSocketsTest) { EXPECT_TRUE(s.ok()) << "s.error_message() = " << s.error_message(); EXPECT_EQ(get_server_sockets_response.socket_ref_size(), 1); } + TEST_F(ChannelzServerTest, GetServerListenSocketsTest) { ResetStubs(); ConfigureProxy(1);