update by comment

Author: Yancey0623

paddle/fluid/framework/executor.cc

@@ -47,19 +47,15 @@ Executor::Executor(const platform::Place& place) : place_(place) {}
 
 #ifdef PADDLE_WITH_DISTRIBUTE
 void Executor::BeginPass() {
-  auto client = ::paddle::operators::distributed::RPCClient::GetInstance<
-      ::paddle::operators::distributed::GRPCClient>();
-
-  client->SendBeginPass();
-  client->Wait();
+  ::paddle::operators::distributed::RPCClient::GetInstance<
+      ::paddle::operators::distributed::GRPCClient>()
+      ->SendBeginPass();
 }
 
 void Executor::EndPass() {
-  auto client = ::paddle::operators::distributed::RPCClient::GetInstance<
-      ::paddle::operators::distributed::GRPCClient>();
-
-  client->SendEndPass();
-  client->Wait();
+  ::paddle::operators::distributed::RPCClient::GetInstance<
+      ::paddle::operators::distributed::GRPCClient>()
+      ->SendEndPass();
 }
 #endif
 

paddle/fluid/operators/distributed/grpc_client.cc

@@ -40,13 +40,15 @@ void GRPCClient::SendBeginPass() {
     VLOG(3) << "send begin pass to: " << it.first;
     this->AsyncSendBeginPass(it.first);
   }
+  this->Wait();
 }
 
 void GRPCClient::SendEndPass() {
   for (auto& it : channels_) {
     VLOG(3) << "send end pass to " << it.first;
     this->AsyncSendEndPass(it.first);
   }
+  this->Wait();
 }
 
 GRPCClient::~GRPCClient() {

paddle/fluid/operators/distributed/rpc_server.cc

@@ -67,7 +67,7 @@ void RPCServer::IncreaseBatchBarrier(const std::string rpc_name) {
 void RPCServer::BeginPass() {
   VLOG(4) << "RPCServer begin increase pass barrier";
   {
-    std::unique_lock<std::mutex> locl(mutex_);
+    std::unique_lock<std::mutex> lock(mutex_);
     client_num_++;
     VLOG(4) << "increase client_num to: " << client_num_;
   }
@@ -77,7 +77,7 @@ void RPCServer::BeginPass() {
 void RPCServer::EndPass() {
   VLOG(4) << "RPCServer begin increase pass barrier";
   {
-    std::unique_lock<std::mutex> locl(mutex_);
+    std::unique_lock<std::mutex> lock(mutex_);
     client_num_--;
     VLOG(4) << "decrease client_num to: " << client_num_;
     if (cur_cond_.load() == rpc_cond_map_[kRequestGet]) {