!20454 Fix result code error

Merge pull request !20454 from ZPaC/optimize-return-code

mindspore/ccsrc/fl/server/distributed_count_service.cc

@@ -300,7 +300,7 @@ bool DistributedCountService::TriggerFirstCountEvent(const std::string &name, st
     if (!communicator_->SendPbRequest(first_count_event, i, ps::core::TcpUserCommand::kCounterEvent)) {
       MS_LOG(ERROR) << "Activating first count event to server " << i << " failed.";
       if (reason != nullptr) {
-        *reason = "Send to rank " + std::to_string(i) + " failed. " + kNetworkError;
+        *reason = kNetworkError;
       }
       return false;
     }
@@ -321,7 +321,7 @@ bool DistributedCountService::TriggerLastCountEvent(const std::string &name, std
     if (!communicator_->SendPbRequest(last_count_event, i, ps::core::TcpUserCommand::kCounterEvent)) {
       MS_LOG(ERROR) << "Activating last count event to server " << i << " failed.";
       if (reason != nullptr) {
-        *reason = "Send to rank " + std::to_string(i) + " failed. " + kNetworkError;
+        *reason = kNetworkError;
       }
       return false;
     }

mindspore/ccsrc/fl/server/distributed_metadata_store.cc

@@ -104,7 +104,7 @@ bool DistributedMetadataStore::UpdateMetadata(const std::string &name, const PBM
                                       &update_meta_rsp_msg)) {
       MS_LOG(ERROR) << "Sending updating metadata message to server " << stored_rank << " failed.";
       if (reason != nullptr) {
-        *reason = "Send to rank " + std::to_string(stored_rank) + " failed. " + kNetworkError;
+        *reason = kNetworkError;
       }
       return false;
     }

mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.cc

@@ -103,7 +103,7 @@ ResultCode PushWeightKernel::PushWeight(const std::shared_ptr<FBBuilder> &fbb,
     std::string reason = "Count for push weight request failed.";
     BuildPushWeightRsp(fbb, schema::ResponseCode_SystemError, reason, current_iter);
     MS_LOG(ERROR) << reason;
-    return count_reason == kNetworkError ? ResultCode::kSuccessAndReturn : ResultCode::kFail;
+    return count_reason == kNetworkError ? ResultCode::kFail : ResultCode::kSuccessAndReturn;
   }
   BuildPushWeightRsp(fbb, schema::ResponseCode_SUCCEED, "PushWeight succeed.", current_iter);
   return ResultCode::kSuccess;

mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.cc

@@ -94,7 +94,7 @@ bool StartFLJobKernel::Launch(const std::vector<AddressPtr> &inputs, const std::
                        std::to_string(LocalMetaStore::GetInstance().value<uint64_t>(kCtxIterationNextRequestTimestamp)),
                        {});
     GenerateOutput(outputs, fbb->GetBufferPointer(), fbb->GetSize());
-    return update_reason == kNetworkError ? true : false;
+    return update_reason == kNetworkError ? false : true;
   }
 
   StartFLJob(fbb, device_meta);
@@ -176,7 +176,7 @@ ResultCode StartFLJobKernel::CountForStartFLJob(const std::shared_ptr<FBBuilder>
       fbb, schema::ResponseCode_OutOfTime, reason, false,
       std::to_string(LocalMetaStore::GetInstance().value<uint64_t>(kCtxIterationNextRequestTimestamp)));
     MS_LOG(ERROR) << reason;
-    return count_reason == kNetworkError ? ResultCode::kSuccessAndReturn : ResultCode::kFail;
+    return count_reason == kNetworkError ? ResultCode::kFail : ResultCode::kSuccessAndReturn;
   }
   return ResultCode::kSuccess;
 }

mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.cc

@@ -173,7 +173,7 @@ ResultCode UpdateModelKernel::UpdateModel(const schema::RequestUpdateModel *upda
       fbb, schema::ResponseCode_OutOfTime, reason,
       std::to_string(LocalMetaStore::GetInstance().value<uint64_t>(kCtxIterationNextRequestTimestamp)));
     MS_LOG(ERROR) << reason;
-    return update_reason == kNetworkError ? ResultCode::kSuccessAndReturn : ResultCode::kFail;
+    return update_reason == kNetworkError ? ResultCode::kFail : ResultCode::kSuccessAndReturn;
   }
 
   BuildUpdateModelRsp(fbb, schema::ResponseCode_SUCCEED, "success not ready",
@@ -209,7 +209,7 @@ ResultCode UpdateModelKernel::CountForUpdateModel(const std::shared_ptr<FBBuilde
       fbb, schema::ResponseCode_OutOfTime, reason,
       std::to_string(LocalMetaStore::GetInstance().value<uint64_t>(kCtxIterationNextRequestTimestamp)));
     MS_LOG(ERROR) << reason;
-    return count_reason == kNetworkError ? ResultCode::kSuccessAndReturn : ResultCode::kFail;
+    return count_reason == kNetworkError ? ResultCode::kFail : ResultCode::kSuccessAndReturn;
   }
   return ResultCode::kSuccess;
 }