From 717fff3faf0aa884e1fdec754db1f426a84b77a5 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 20 Mar 2018 19:43:17 -0700 Subject: Use same queue for batch ops and for shutdown in h2_ssl_cert_test --- test/core/end2end/h2_ssl_cert_test.cc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 9e2082ce9d..e7c5bba5ec 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -57,8 +57,6 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( f.fixture_data = ffd; f.cq = grpc_completion_queue_create_for_next(nullptr); - f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr); - return f; } @@ -283,14 +281,11 @@ static void shutdown_server(grpc_end2end_test_fixture* f) { * thread for the server to poll the completion queue while the shutdown * progresses.) */ - GPR_ASSERT(grpc_completion_queue_next( - f->cq, grpc_timeout_milliseconds_to_deadline(100), nullptr) - .type == GRPC_QUEUE_TIMEOUT); - grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000), - grpc_timeout_seconds_to_deadline(5), - nullptr) - .type == GRPC_OP_COMPLETE); + grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); + grpc_event ev = grpc_completion_queue_next( + f->cq, grpc_timeout_seconds_to_deadline(5), nullptr); + ASSERT_EQ(ev.type, GRPC_OP_COMPLETE); + ASSERT_EQ(ev.tag, tag(1000)); grpc_server_destroy(f->server); f->server = nullptr; } @@ -308,7 +303,6 @@ static void end_test(grpc_end2end_test_fixture* f) { grpc_completion_queue_shutdown(f->cq); drain_cq(f->cq); grpc_completion_queue_destroy(f->cq); - grpc_completion_queue_destroy(f->shutdown_cq); } static void simple_request_body(grpc_end2end_test_fixture f, -- cgit v1.2.3 From 7ed7beef6820a6de545c1af4c219663e0045449a Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 20 Mar 2018 19:45:28 -0700 Subject: Remove unnecessary comment --- test/core/end2end/h2_ssl_cert_test.cc | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'test') diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index e7c5bba5ec..9addfff232 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -270,17 +270,6 @@ static void drain_cq(grpc_completion_queue* cq) { static void shutdown_server(grpc_end2end_test_fixture* f) { if (!f->server) return; - /* Perform a completion queue next, so that any pending operations can be - * finished, and resources can be released. This is so that, shutdown does not - * hang. For example, the server might be stuck in the handshaking code, which - * keeps a ref to a listener. Unless, it is unref'd, shutdown won't be able - * to proceed. - * - * (If shutdown times out, it is probably because 100ms wasn't enough. In that - * case, the deadline can be increased. Or, we could simply have another - * thread for the server to poll the completion queue while the shutdown - * progresses.) - */ grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); grpc_event ev = grpc_completion_queue_next( f->cq, grpc_timeout_seconds_to_deadline(5), nullptr); -- cgit v1.2.3 From e7ef1e5968cf81f622843f2712a9eeec434d1189 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 22 Mar 2018 11:44:13 -0700 Subject: Combine cq draining and server destroy for h2_ssl_cert_test --- test/core/end2end/h2_ssl_cert_test.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 9addfff232..0741e7c39b 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -268,13 +268,13 @@ static void drain_cq(grpc_completion_queue* cq) { } while (ev.type != GRPC_QUEUE_SHUTDOWN); } +// Shuts down the server. +// Side effect - Also shuts down and drains the completion queue. static void shutdown_server(grpc_end2end_test_fixture* f) { if (!f->server) return; grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); - grpc_event ev = grpc_completion_queue_next( - f->cq, grpc_timeout_seconds_to_deadline(5), nullptr); - ASSERT_EQ(ev.type, GRPC_OP_COMPLETE); - ASSERT_EQ(ev.tag, tag(1000)); + grpc_completion_queue_shutdown(f->cq); + drain_cq(f->cq); grpc_server_destroy(f->server); f->server = nullptr; } @@ -288,9 +288,6 @@ static void shutdown_client(grpc_end2end_test_fixture* f) { static void end_test(grpc_end2end_test_fixture* f) { shutdown_client(f); shutdown_server(f); - - grpc_completion_queue_shutdown(f->cq); - drain_cq(f->cq); grpc_completion_queue_destroy(f->cq); } -- cgit v1.2.3