fix

Author: ywy2090

cpp/wedpr-computing/ppc-mpc/src/MPCService.cpp

@@ -148,10 +148,9 @@ void MPCService::onFailed(const std::string &jobId, const std::string &msg)
     jobStatus.timeCostMs = utcSteadyTime() - jobStatus.startTimeMs;
 
     MPC_LOG(INFO) << LOG_DESC("[MPCService][onFailed]") 
-                << "job failed"
                 << LOG_KV("jobId", jobId)
-                << LOG_KV("timeCostMs", jobStatus.timeCostMs)
-                ;
+                << LOG_KV("msg", msg) 
+                << LOG_KV("timeCostMs", jobStatus.timeCostMs);
 }
 
 
@@ -209,17 +208,17 @@ void MPCService::doRun(const JobInfo& jobInfo)
             initialize_lineReader(jobInfo, mpcFileHdfsPath, DataResourceType::HDFS);
     auto mpcFileWriter =
             initialize_lineWriter(jobInfo, mpcFileLocalPath, DataResourceType::FILE);
-        readAndSaveFile(mpcFileHdfsPath, mpcFileLocalPath, mpcFileReader, mpcFileWriter);
+    readAndSaveFile(mpcFileHdfsPath, mpcFileLocalPath, mpcFileReader, mpcFileWriter);
 
     // 2 download mpc prepare file
     std::string mpcPrepareFileHdfsPath = jobInfo.inputFilePath;
 
     std::string mpcPrepareFileLocalPath = localPathPrefix + MPC_PREPARE_FILE + "-P" + std::to_string(selfIndex) + "-0";
     auto datasetFileReader =
             initialize_lineReader(jobInfo, mpcPrepareFileHdfsPath, DataResourceType::HDFS);
-        auto datasetFileWriter =
+    auto datasetFileWriter =
             initialize_lineWriter(jobInfo, mpcPrepareFileLocalPath, DataResourceType::FILE);
-        readAndSaveFile(mpcPrepareFileHdfsPath, mpcPrepareFileLocalPath, datasetFileReader, datasetFileWriter);
+    readAndSaveFile(mpcPrepareFileHdfsPath, mpcPrepareFileLocalPath, datasetFileReader, datasetFileWriter);
 
     // 3 run mpc job
     int outExitStatus = MPC_SUCCESS;
@@ -309,7 +308,6 @@ void MPCService::runMpcRpc(Json::Value const& request, RespFunc func)
         else 
         {
             response["code"] = MPC_DUPLICATED;
-           
             response["message"] = "duplicated submit job";
         }
     }
@@ -387,7 +385,7 @@ void MPCService::doKill(Json::Value const& request, Json::Value& response)
 
         std::string killCmd = "ps -ef |grep mpc | grep " + jobId +
                               " | grep -v grep | awk '{print $2}' | xargs kill -9";
-        MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_KV("killCmd", killCmd);
+        MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_KV("jobId", jobId) << LOG_KV("killCmd", killCmd);
 
         int outExitStatus = 0;
         std::string outResult;
@@ -397,27 +395,32 @@ void MPCService::doKill(Json::Value const& request, Json::Value& response)
         {
             message = "Kill mpc job successfully";
             onKill(jobId, message);
-            MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_DESC(message);
+            MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_KV("jobId", jobId) << LOG_DESC(message);
             response["code"] = MPC_SUCCESS;
             response["message"] = "success";
         }
         else
         {
             message = "Kill mpc job failed";
-            MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_DESC(message);
+            MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_KV("jobId", jobId) << LOG_DESC(message)
+                << LOG_KV("outExitStatus", outExitStatus)
+                << LOG_KV("outResult", outResult);
             response["code"] = MPC_FAILED;
             response["message"] = message;
         }
     }
     catch (const std::exception& e)
     {
         const std::string diagnostic_information = std::string(boost::diagnostic_information(e));
-        MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_DESC("kill mpc job failed:")
+        MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_KV("jobId", jobId) << LOG_DESC("kill mpc job failed:")
                       << LOG_DESC(diagnostic_information);
         response["code"] = MPC_FAILED;
         response["message"] = diagnostic_information;
     }
-    MPC_LOG(INFO) << LOG_DESC("kill mpc job") << LOG_KV("timecost(ms)", utcSteadyTime() - startT);
+    MPC_LOG(INFO) << LOG_DESC("kill mpc job") 
+        << LOG_KV("jobId", jobId)
+        << LOG_KV("request", response.toStyledString())
+        << LOG_KV("timecost(ms)", utcSteadyTime() - startT);
 }
 
 void MPCService::killMpcRpc(Json::Value const& request, RespFunc func)