Add service definition to sync server

3 files changed, 21 insertions, 5 deletions

diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc
index e25a6689e5..3871c644be 100644
--- a/test/cpp/end2end/client_callback_end2end_test.cc
+++ b/test/cpp/end2end/client_callback_end2end_test.cc
@@ -219,8 +219,8 @@ TEST_P(ClientCallbackEnd2endTest, SendClientInitialMetadata) {
         gpr_log(GPR_ERROR, s.error_message().c_str());
         gpr_log(GPR_ERROR, s.error_details().c_str());
         GPR_ASSERT(s.ok());
+        
         std::lock_guard<std::mutex> l(mu);
-
         done = true;
         cv.notify_one();
       });
diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc
index a7be8a798a..8f97318252 100644
--- a/test/cpp/end2end/test_service_impl.cc
+++ b/test/cpp/end2end/test_service_impl.cc
@@ -181,17 +181,16 @@ Status TestServiceImpl::Echo(ServerContext* context, const EchoRequest* request,
   return Status::OK;
 }
 
-void CallbackTestServiceImpl::CheckClientInitialMetadata(
+Status TestServiceImpl::CheckClientInitialMetadata(
     ServerContext* context, const SimpleRequest* request,
-    SimpleResponse* response,
-    experimental::ServerCallbackRpcController* controller) {
+    SimpleResponse* response) {
   EXPECT_EQ(MetadataMatchCount(context->client_metadata(),
                                kCheckClientInitialMetadataKey,
                                kCheckClientInitialMetadataVal),
             1);
   EXPECT_EQ(1u,
             context->client_metadata().count(kCheckClientInitialMetadataKey));
-  controller->Finish(Status::OK);
+  return Status::OK;
 }
 
 void CallbackTestServiceImpl::Echo(
@@ -212,6 +211,19 @@ void CallbackTestServiceImpl::Echo(
   }
 }
 
+void CallbackTestServiceImpl::CheckClientInitialMetadata(
+    ServerContext* context, const SimpleRequest* request,
+    SimpleResponse* response,
+    experimental::ServerCallbackRpcController* controller) {
+  EXPECT_EQ(MetadataMatchCount(context->client_metadata(),
+                               kCheckClientInitialMetadataKey,
+                               kCheckClientInitialMetadataVal),
+            1);
+  EXPECT_EQ(1u,
+            context->client_metadata().count(kCheckClientInitialMetadataKey));
+  controller->Finish(Status::OK);
+}
+
 void CallbackTestServiceImpl::EchoNonDelayed(
     ServerContext* context, const EchoRequest* request, EchoResponse* response,
     experimental::ServerCallbackRpcController* controller) {
diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h
index 124d5e512b..2c63aa4dab 100644
--- a/test/cpp/end2end/test_service_impl.h
+++ b/test/cpp/end2end/test_service_impl.h
@@ -55,6 +55,10 @@ class TestServiceImpl : public ::grpc::testing::EchoTestService::Service {
   Status Echo(ServerContext* context, const EchoRequest* request,
               EchoResponse* response) override;
 
+  Status CheckClientInitialMetadata(
+      ServerContext* context, const SimpleRequest* request,
+      SimpleResponse* response) override;
+
   // Unimplemented is left unimplemented to test the returned error.
 
   Status RequestStream(ServerContext* context,