p74368291
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!17901 fixed cluster state 

Merge pull request !17901 from anancds/bug
This commit is contained in:
i-robot 2021-06-07 19:48:40 +08:00 committed by Gitee
parent 9bd12517fb 7f66682742
commit c4cadda84b
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mindspore/ccsrc/ps/core/abstract_node.cc
View File

@ -475,7 +475,9 @@ void AbstractNode::ProcessSendMetadata(std::shared_ptr<TcpConnection> conn, std:
send_meta_message.ParseFromArray(data, size); send_meta_message.ParseFromArray(data, size);
worker_num_ = send_meta_message.worker_num(); worker_num_ = send_meta_message.worker_num();
server_num_ = send_meta_message.server_num(); server_num_ = send_meta_message.server_num();
MS_LOG(WARNING) << "The send metadata worker num:" << worker_num_ << ", server num:" << server_num_; current_cluster_state_ = send_meta_message.cluster_state();
MS_LOG(INFO) << "The send metadata worker num:" << worker_num_ << ", server num:" << server_num_
<< ", cluster state is:" << current_cluster_state_;
nodes_address_.clear(); nodes_address_.clear();
for (const auto &it : send_meta_message.servers_meta()) { for (const auto &it : send_meta_message.servers_meta()) {

2
mindspore/ccsrc/ps/core/protos/comm.proto
View File

@ -119,6 +119,8 @@ message SendMetadataMessage {
int32 worker_num = 2; int32 worker_num = 2;
// the current server number. // the current server number.
int32 server_num = 3; int32 server_num = 3;
// the current cluster state.
ClusterState cluster_state = 4;
} }
message FinishMessage { message FinishMessage {

1
mindspore/ccsrc/ps/core/scheduler_node.cc
View File

@ -239,6 +239,7 @@ void SchedulerNode::SendMetadata(const std::shared_ptr<TcpClient> &client) {
std::vector<ServersMeta> servers_meta_list = node_manager_.FetchServersMeta(); std::vector<ServersMeta> servers_meta_list = node_manager_.FetchServersMeta();
send_metadata_message.set_worker_num(node_manager_.worker_num()); send_metadata_message.set_worker_num(node_manager_.worker_num());
send_metadata_message.set_server_num(node_manager_.server_num()); send_metadata_message.set_server_num(node_manager_.server_num());
send_metadata_message.set_cluster_state(node_manager_.GetClusterState());
*send_metadata_message.mutable_servers_meta() = {servers_meta_list.begin(), servers_meta_list.end()}; *send_metadata_message.mutable_servers_meta() = {servers_meta_list.begin(), servers_meta_list.end()};