diff --git a/cmake/external/grpc.cmake b/cmake/external/grpc.cmake index 7828ba24aaca5e7eba8b85037ddcd2bf1a2f2799..42f94bb6287bccccc79072e02ee81aa4d13251bf 100644 --- a/cmake/external/grpc.cmake +++ b/cmake/external/grpc.cmake @@ -47,7 +47,7 @@ ExternalProject_Add( #URL "http://paddlepaddledeps.bj.bcebos.com/grpc-v1.10.x.tar.gz" URL "http://localhost:8000/grpc-v1.13.x.tar.gz" #URL_MD5 "1f268a2aff6759839dccd256adcc91cf" - URL_MD5 "c93a1ba08a449e5b800524131cc900a8" + URL_MD5 "f5ae795081d7e5befa648876aee62cc8" PREFIX ${GRPC_SOURCES_DIR} UPDATE_COMMAND "" CONFIGURE_COMMAND "" diff --git a/paddle/fluid/operators/distributed/grpc_client.cc b/paddle/fluid/operators/distributed/grpc_client.cc index 7f16692d684144ea76a3e831f2f05a107a5f7f78..7feccf3c6bbcc2536ca50751362c3b6b5f720cbe 100644 --- a/paddle/fluid/operators/distributed/grpc_client.cc +++ b/paddle/fluid/operators/distributed/grpc_client.cc @@ -15,7 +15,6 @@ limitations under the License. */ #include "paddle/fluid/operators/distributed/grpc_client.h" #include -#include #include @@ -43,37 +42,11 @@ void GRPCClient::SendComplete() { } 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(); - - for (auto& it : channels_) { - LOG(ERROR) << "channel service config:" - << it.second->GetServiceConfigJSON(); - LOG(ERROR) << "channel lb config:" - << it.second->GetLoadBalancingPolicyName(); - } - 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 guard(chan_mutex_); for (auto& it : channels_) { - LOG(ERROR) << "channel ptr use count:" << it.second.use_count(); - LOG(ERROR) << "channel ptr use count:" << it.second.get(); it.second.reset(); } channels_.clear(); @@ -330,9 +303,7 @@ std::shared_ptr GRPCClient::GetChannel(const std::string& ep) { auto ch = grpc::CreateCustomChannel(ep, grpc::InsecureChannelCredentials(), args); - LOG(ERROR) << "get channel ep: " << ep << "count: " << ch.use_count(); channels_[ep] = ch; - LOG(ERROR) << "get channel ep: " << ep << "count: " << ch.use_count(); return ch; }