fix

Author: ywy2090

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

@@ -76,6 +76,7 @@ bool MPCService::addJobIfNotRunning(const JobInfo& jobInfo)
     jobStatus.timeCostMs = 0;
 
     m_job2Status[jobInfo.jobId] = jobStatus;
+    m_runningJobs.insert(jobInfo.jobId);
 
     MPC_LOG(INFO) << LOG_DESC("[MPCService][addJob]") 
                 << "job added successfully"
@@ -109,6 +110,7 @@ bool MPCService::queryJobStatus(const std::string &jobId, JobStatus &jobStatus)
 void MPCService::onSuccess(const std::string &jobId, const std::string &msg)
 {
     std::lock_guard<std::mutex> l(x_job2Status);
+    m_runningJobs.erase(jobId);
     auto it = m_job2Status.find(jobId);
     if (it == m_job2Status.end())
     {
@@ -133,6 +135,7 @@ void MPCService::onSuccess(const std::string &jobId, const std::string &msg)
 void MPCService::onFailed(const std::string &jobId, const std::string &msg)
 {
     std::lock_guard<std::mutex> l(x_job2Status);
+    m_runningJobs.erase(jobId);
     auto it = m_job2Status.find(jobId);
     if (it == m_job2Status.end())
     {
@@ -157,6 +160,7 @@ void MPCService::onFailed(const std::string &jobId, const std::string &msg)
 void MPCService::onKill(const std::string &jobId, const std::string &msg)
 {
     std::lock_guard<std::mutex> l(x_job2Status);
+    m_runningJobs.erase(jobId);
     auto it = m_job2Status.find(jobId);
     if (it == m_job2Status.end())
     {
@@ -297,7 +301,6 @@ void MPCService::runMpcRpc(Json::Value const& request, RespFunc func)
     {
         auto jobInfo = paramsToJobInfo(request);
         auto r = addJobIfNotRunning(jobInfo);
-
         if (r)
         {  
             doRun(jobInfo);
@@ -412,13 +415,12 @@ void MPCService::doKill(Json::Value const& request, Json::Value& response)
     catch (const std::exception& e)
     {
         const std::string diagnostic_information = std::string(boost::diagnostic_information(e));
-        MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << LOG_KV("jobId", jobId) << LOG_DESC("kill mpc job failed:")
+        MPC_LOG(INFO) << LOG_DESC("[MPCService][doKill]") << 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("jobId", jobId)
         << LOG_KV("request", response.toStyledString())
         << LOG_KV("timecost(ms)", utcSteadyTime() - startT);
 }
@@ -565,7 +567,6 @@ void MPCService::makeCommand(std::string& cmd, const JobInfo& jobInfo)
             << LOG_KV("mpcRootPath", mpcRootPath)
             << LOG_KV("ret", r)
             << LOG_KV("jobId", jobId);
-            ;
     }
     std::string compileFilePath = mpcRootPath + PATH_SEPARATOR + MPC_ALGORITHM_COMPILER;
     int participantCount = jobInfo.participantCount;
@@ -580,7 +581,6 @@ void MPCService::makeCommand(std::string& cmd, const JobInfo& jobInfo)
         MPC_LOG(ERROR) << LOG_DESC("[MPCService] compile file not exist") 
             << LOG_KV("compileFilePath", compileFilePath)
             << LOG_KV("jobId", jobId);
-            ;
 
         BOOST_THROW_EXCEPTION(MpcCompilerNotExistException()
                               << errinfo_comment("compile file not exist:" + compileFilePath));

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

@@ -26,9 +26,11 @@
 #include "ppc-tools/src/config/StorageConfig.h"
 #include <bcos-utilities/Common.h>
 #include <bcos-utilities/ThreadPool.h>
+#include <bcos-utilities/Timer.h>
 #include <memory>
 #include <mutex>
 #include <string>
+#include <unordered_map>
 
 namespace ppc::mpc
 {
@@ -37,7 +39,13 @@ class MPCService: std::enable_shared_from_this<MPCService>
 public:
     using Ptr = std::shared_ptr<MPCService>;
     MPCService() = default;
-    virtual ~MPCService() = default;
+    virtual ~MPCService() 
+    {
+        if (m_threadPool)
+        {
+            m_threadPool->stop();
+        }
+    }
 
     void runMpcRpc(Json::Value const& request, ppc::rpc::RespFunc func);
     void killMpcRpc(Json::Value const& request, ppc::rpc::RespFunc func);
@@ -82,6 +90,7 @@ class MPCService: std::enable_shared_from_this<MPCService>
 private:
     std::mutex x_job2Status;
     std::unordered_map<std::string, JobStatus> m_job2Status;
+    std::unordered_set<std::string> m_runningJobs;
     ppc::tools::MPCConfig m_mpcConfig;
     ppc::tools::StorageConfig m_storageConfig;