提交 207d1b81 编写于 作者: M minqiyang

Add fixed grpc

上级 1d6ecd3c
...@@ -47,7 +47,7 @@ ExternalProject_Add( ...@@ -47,7 +47,7 @@ ExternalProject_Add(
#URL "http://paddlepaddledeps.bj.bcebos.com/grpc-v1.10.x.tar.gz" #URL "http://paddlepaddledeps.bj.bcebos.com/grpc-v1.10.x.tar.gz"
URL "http://localhost:8000/grpc-v1.13.x.tar.gz" URL "http://localhost:8000/grpc-v1.13.x.tar.gz"
#URL_MD5 "1f268a2aff6759839dccd256adcc91cf" #URL_MD5 "1f268a2aff6759839dccd256adcc91cf"
URL_MD5 "27019f520a32161396b319e57c24a5ac" URL_MD5 "c93a1ba08a449e5b800524131cc900a8"
PREFIX ${GRPC_SOURCES_DIR} PREFIX ${GRPC_SOURCES_DIR}
UPDATE_COMMAND "" UPDATE_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
......
...@@ -15,6 +15,7 @@ limitations under the License. */ ...@@ -15,6 +15,7 @@ limitations under the License. */
#include "paddle/fluid/operators/distributed/grpc_client.h" #include "paddle/fluid/operators/distributed/grpc_client.h"
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h>
#include <limits> #include <limits>
...@@ -42,8 +43,32 @@ void GRPCClient::SendComplete() { ...@@ -42,8 +43,32 @@ void GRPCClient::SendComplete() {
} }
GRPCClient::~GRPCClient() { GRPCClient::~GRPCClient() {
LOG(ERROR) << "start sleep:";
usleep(10000);
for (auto& it : channels_) {
LOG(ERROR) << "channel service config:"
<< it.second->GetServiceConfigJSON();
LOG(ERROR) << "channel lb config:"
<< it.second->GetLoadBalancingPolicyName();
}
Wait(); Wait();
for (auto& it : channels_) {
LOG(ERROR) << "channel service config:"
<< it.second->GetServiceConfigJSON();
LOG(ERROR) << "channel lb config:"
<< it.second->GetLoadBalancingPolicyName();
}
cq_.Shutdown(); cq_.Shutdown();
for (auto& it : channels_) {
LOG(ERROR) << "channel service config:"
<< it.second->GetServiceConfigJSON();
LOG(ERROR) << "channel lb config:"
<< it.second->GetLoadBalancingPolicyName();
}
{ {
std::lock_guard<std::mutex> guard(chan_mutex_); std::lock_guard<std::mutex> guard(chan_mutex_);
for (auto& it : channels_) { for (auto& it : channels_) {
...@@ -53,6 +78,7 @@ GRPCClient::~GRPCClient() { ...@@ -53,6 +78,7 @@ GRPCClient::~GRPCClient() {
} }
channels_.clear(); channels_.clear();
} }
client_thread_->join(); client_thread_->join();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册