Address reviewer comments
diff --git a/src/proto/grpc/testing/echo_messages.proto b/src/proto/grpc/testing/echo_messages.proto
index ef99cfc..6f1e5f3 100644
--- a/src/proto/grpc/testing/echo_messages.proto
+++ b/src/proto/grpc/testing/echo_messages.proto
@@ -50,7 +50,7 @@
int32 server_sleep_us = 15; // sleep when invoking server for deadline tests
int32 backend_channel_idx = 16; // which backend to send request to
bool echo_metadata_initially = 17;
- bool server_notify_started = 18;
+ bool server_notify_client_when_started = 18;
}
message EchoRequest {
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 4f8d6c7..3311394 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -1131,14 +1131,14 @@
}
}
-TEST_P(End2endTest, CancelDelayedRpc) {
+TEST_P(End2endTest, CancelRpcAfterStart) {
MAYBE_SKIP_TEST;
ResetStub();
EchoRequest request;
EchoResponse response;
ClientContext context;
request.set_message("hello");
- request.mutable_param()->set_server_notify_started(true);
+ request.mutable_param()->set_server_notify_client_when_started(true);
request.mutable_param()->set_skip_cancelled_check(true);
Status s;
std::thread echo_thread([this, &s, &context, &request, &response] {
@@ -1146,9 +1146,9 @@
EXPECT_EQ(StatusCode::CANCELLED, s.error_code());
});
if (!GetParam().callback_server) {
- service_.ClientWaitRpcStarted();
+ service_.ClientWaitUntilRpcStarted();
} else {
- callback_service_.ClientWaitRpcStarted();
+ callback_service_.ClientWaitUntilRpcStarted();
}
context.TryCancel();
diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc
index 5ac6ad2..d9846fd 100644
--- a/test/cpp/end2end/test_service_impl.cc
+++ b/test/cpp/end2end/test_service_impl.cc
@@ -127,8 +127,9 @@
Status TestServiceImpl::Echo(ServerContext* context, const EchoRequest* request,
EchoResponse* response) {
- if (request->has_param() && request->param().server_notify_started()) {
- signaller_.SignalClientRpcStarted();
+ if (request->has_param() &&
+ request->param().server_notify_client_when_started()) {
+ signaller_.SignalClientThatRpcStarted();
signaller_.ServerWaitToContinue();
}
@@ -427,8 +428,9 @@
started_ = true;
- if (request->has_param() && request->param().server_notify_started()) {
- service->signaller_.SignalClientRpcStarted();
+ if (request->has_param() &&
+ request->param().server_notify_client_when_started()) {
+ service->signaller_.SignalClientThatRpcStarted();
// Block on the "wait to continue" decision in a different thread since
// we can't tie up an EM thread with blocking events. We can join it in
// OnDone since it would definitely be done by then.
diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h
index 4b385ec..924dccf 100644
--- a/test/cpp/end2end/test_service_impl.h
+++ b/test/cpp/end2end/test_service_impl.h
@@ -49,7 +49,7 @@
class TestServiceSignaller {
public:
- void ClientWaitRpcStarted() {
+ void ClientWaitUntilRpcStarted() {
std::unique_lock<std::mutex> lock(mu_);
cv_rpc_started_.wait(lock, [this] { return rpc_started_; });
}
@@ -57,7 +57,7 @@
std::unique_lock<std::mutex> lock(mu_);
cv_server_continue_.wait(lock, [this] { return server_should_continue_; });
}
- void SignalClientRpcStarted() {
+ void SignalClientThatRpcStarted() {
std::unique_lock<std::mutex> lock(mu_);
rpc_started_ = true;
cv_rpc_started_.notify_one();
@@ -106,7 +106,7 @@
std::unique_lock<std::mutex> lock(mu_);
return signal_client_;
}
- void ClientWaitRpcStarted() { signaller_.ClientWaitRpcStarted(); }
+ void ClientWaitUntilRpcStarted() { signaller_.ClientWaitUntilRpcStarted(); }
void SignalServerToContinue() { signaller_.SignalServerToContinue(); }
private:
@@ -147,7 +147,7 @@
std::unique_lock<std::mutex> lock(mu_);
return signal_client_;
}
- void ClientWaitRpcStarted() { signaller_.ClientWaitRpcStarted(); }
+ void ClientWaitUntilRpcStarted() { signaller_.ClientWaitUntilRpcStarted(); }
void SignalServerToContinue() { signaller_.SignalServerToContinue(); }
private:
