complement log

cyjseagull · cyjseagull · commit 860fcc011679 · 2024-11-25T18:15:39.000+08:00
diff --git a/cpp/wedpr-computing/ppc-pir/src/OtPIRImpl.cpp b/cpp/wedpr-computing/ppc-pir/src/OtPIRImpl.cpp
@@ -149,10 +149,11 @@ void OtPIRImpl::onReceiveMessage(ppc::front::PPCMessageFace::Ptr _msg)
     }
 }
 
-void OtPIRImpl::onReceivedErrorNotification(const std::string& _taskID)
+void OtPIRImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message)
 {
+    PIR_LOG(WARNING) << LOG_DESC("onReceivedErrorNotification") << printPPCMsg(_message);
     // finish the task while the peer is failed
-    auto taskState = findPendingTask(_taskID);
+    auto taskState = findPendingTask(_message->taskID());
     if (taskState)
     {
         taskState->onPeerNotifyFinish();
@@ -242,7 +243,7 @@ void OtPIRImpl::handleReceivedMessage(const ppc::front::PPCMessageFace::Ptr& _me
             {
             case int(CommonMessageType::ErrorNotification):
             {
-                pir->onReceivedErrorNotification(_message->taskID());
+                pir->onReceivedErrorNotification(_message);
                 break;
             }
             case int(CommonMessageType::PingPeer):
diff --git a/cpp/wedpr-computing/ppc-pir/src/OtPIRImpl.h b/cpp/wedpr-computing/ppc-pir/src/OtPIRImpl.h
@@ -59,7 +59,7 @@ class OtPIRImpl : public std::enable_shared_from_this<OtPIRImpl>,
     // register to the front to get the message related to ot-pir
     void onReceiveMessage(ppc::front::PPCMessageFace::Ptr _message) override;
 
-    void onReceivedErrorNotification(const std::string& _taskID) override;
+    void onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message) override;
     void onSelfError(
         const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer) override;
 
diff --git a/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/CM2020PSIImpl.cpp b/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/CM2020PSIImpl.cpp
@@ -318,11 +318,11 @@ void CM2020PSIImpl::stop()
     CM2020_PSI_LOG(INFO) << LOG_DESC("CM2020-PSI stopped");
 }
 
-void CM2020PSIImpl::onReceivedErrorNotification(const std::string& _taskID)
+void CM2020PSIImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message)
 {
-    CM2020_PSI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << LOG_KV("taskID", _taskID);
+    CM2020_PSI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << printPPCMsg(_message);
     // finish the task while the peer is failed
-    auto taskState = findPendingTask(_taskID);
+    auto taskState = findPendingTask(_message->taskID());
     if (taskState)
     {
         taskState->onPeerNotifyFinish();
@@ -410,7 +410,7 @@ void CM2020PSIImpl::handleReceivedMessage(const ppc::front::PPCMessageFace::Ptr&
             {
             case int(CommonMessageType::ErrorNotification):
             {
-                psi->onReceivedErrorNotification(_message->taskID());
+                psi->onReceivedErrorNotification(_message);
                 break;
             }
             case int(CommonMessageType::PingPeer):
diff --git a/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/CM2020PSIImpl.h b/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/CM2020PSIImpl.h
@@ -62,7 +62,7 @@ class CM2020PSIImpl : public bcos::Worker,
 
     void start() override;
     void stop() override;
-    void onReceivedErrorNotification(const std::string& _taskID) override;
+    void onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message) override;
     void onSelfError(
         const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer) override;
 
diff --git a/cpp/wedpr-computing/ppc-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.cpp b/cpp/wedpr-computing/ppc-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.cpp
@@ -131,7 +131,7 @@ void EcdhConnPSIImpl::stop()
     }
 }
 
-void EcdhConnPSIImpl::onReceivedErrorNotification(const std::string& _taskID) {}
+void EcdhConnPSIImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const&) {}
 
 void EcdhConnPSIImpl::onSelfError(
     const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer)
diff --git a/cpp/wedpr-computing/ppc-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.h b/cpp/wedpr-computing/ppc-psi/src/ecdh-conn-psi/EcdhConnPSIImpl.h
@@ -61,7 +61,7 @@ class EcdhConnPSIImpl : public std::enable_shared_from_this<EcdhConnPSIImpl>,
     void start() override;
     void stop() override;
 
-    void onReceivedErrorNotification(const std::string& _taskID) override;
+    void onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message) override;
     void onSelfError(
         const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer) override;
     void executeWorker() override;
diff --git a/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.cpp b/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.cpp
@@ -266,11 +266,11 @@ void EcdhMultiPSIImpl::checkFinishedTask()
     }
 }
 
-void EcdhMultiPSIImpl::onReceivedErrorNotification(const std::string& _taskID)
+void EcdhMultiPSIImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message)
 {
-    ECDH_MULTI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << LOG_KV("taskID", _taskID);
+    ECDH_MULTI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << printPPCMsg(_message);
     // finish the task while the peer is failed
-    auto taskState = findPendingTask(_taskID);
+    auto taskState = findPendingTask(_message->taskID());
     if (taskState)
     {
         taskState->onPeerNotifyFinish();
@@ -308,7 +308,7 @@ void EcdhMultiPSIImpl::executeWorker()
         auto pop_msg = _msg.second;
         if (pop_msg->messageType() == uint8_t(CommonMessageType::ErrorNotification))
         {
-            onReceivedErrorNotification(pop_msg->taskID());
+            onReceivedErrorNotification(pop_msg);
             return;
         }
         else if (pop_msg->messageType() == uint8_t(CommonMessageType::PingPeer))
diff --git a/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.h b/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/EcdhMultiPSIImpl.h
@@ -40,7 +40,7 @@ class EcdhMultiPSIImpl : public std::enable_shared_from_this<EcdhMultiPSIImpl>,
     void stop() override;
 
     void checkFinishedTask();
-    void onReceivedErrorNotification(const std::string& _taskID) override;
+    void onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message) override;
     void onSelfError(
         const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer) override;
     void executeWorker() override;
diff --git a/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/core/EcdhMultiPSICalculator.cpp b/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/core/EcdhMultiPSICalculator.cpp
@@ -95,7 +95,7 @@ void EcdhMultiPSICalculator::blindData(std::string _taskID, bcos::bytes _randA)
         uint64_t dataOffset = 0;
         do
         {
-            if (m_taskState->loadFinished())
+            if (m_taskState->loadFinished() || m_taskState->taskDone())
             {
                 break;
             }
diff --git a/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/core/EcdhMultiPSIMaster.cpp b/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/core/EcdhMultiPSIMaster.cpp
@@ -121,7 +121,7 @@ void EcdhMultiPSIMaster::blindData()
         auto reader = m_taskState->reader();
         do
         {
-            if (m_taskState->loadFinished())
+            if (m_taskState->loadFinished() || m_taskState->taskDone())
             {
                 break;
             }
diff --git a/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/core/EcdhMultiPSIPartner.cpp b/cpp/wedpr-computing/ppc-psi/src/ecdh-multi-psi/core/EcdhMultiPSIPartner.cpp
@@ -53,7 +53,7 @@ void EcdhMultiPSIPartner::onReceiveRandomA(bcos::bytesPointer _randA)
         uint64_t dataOffset = 0;
         do
         {
-            if (m_taskState->loadFinished())
+            if (m_taskState->loadFinished() || m_taskState->taskDone())
             {
                 break;
             }
diff --git a/cpp/wedpr-computing/ppc-psi/src/labeled-psi/LabeledPSIImpl.cpp b/cpp/wedpr-computing/ppc-psi/src/labeled-psi/LabeledPSIImpl.cpp
@@ -220,10 +220,11 @@ void LabeledPSIImpl::stop()
     LABELED_PSI_LOG(INFO) << LOG_DESC("LabeledPSI stopped");
 }
 
-void LabeledPSIImpl::onReceivedErrorNotification(const std::string& _taskID)
+void LabeledPSIImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message)
 {
+    LABELED_PSI_LOG(WARNING) << LOG_DESC("onReceivedErrorNotification") << printPPCMsg(_message);
     // finish the task while the peer is failed
-    auto taskState = findPendingTask(_taskID);
+    auto taskState = findPendingTask(_message->taskID());
     if (taskState)
     {
         taskState->onPeerNotifyFinish();
@@ -690,7 +691,7 @@ void LabeledPSIImpl::handleReceivedMessage(const ppc::front::PPCMessageFace::Ptr
             {
             case int(CommonMessageType::ErrorNotification):
             {
-                psi->onReceivedErrorNotification(_message->taskID());
+                psi->onReceivedErrorNotification(_message);
                 break;
             }
             case int(CommonMessageType::PingPeer):
diff --git a/cpp/wedpr-computing/ppc-psi/src/labeled-psi/LabeledPSIImpl.h b/cpp/wedpr-computing/ppc-psi/src/labeled-psi/LabeledPSIImpl.h
@@ -62,7 +62,7 @@ class LabeledPSIImpl : public bcos::Worker,
     void start() override;
     void stop() override;
 
-    void onReceivedErrorNotification(const std::string& _taskID) override;
+    void onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message) override;
     void onSelfError(
         const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer) override;
 
diff --git a/cpp/wedpr-computing/ppc-psi/src/psi-framework/TaskGuarder.cpp b/cpp/wedpr-computing/ppc-psi/src/psi-framework/TaskGuarder.cpp
@@ -199,6 +199,8 @@ void TaskGuarder::checkPeerActivity()
                         std::make_shared<bcos::Error>(
                             (int)PSIRetCode::PeerNodeDown, "peer node is down, id: " + peerID),
                         false);
+                    PSI_LOG(INFO) << LOG_DESC("checkPeerActivity: peer node-down")
+                                  << LOG_KV("peer", peerID) << LOG_KV("task", task->id());
                 },
                 nullptr);
         }
diff --git a/cpp/wedpr-computing/ppc-psi/src/psi-framework/TaskGuarder.h b/cpp/wedpr-computing/ppc-psi/src/psi-framework/TaskGuarder.h
@@ -44,7 +44,7 @@ class TaskGuarder
     }
     virtual ~TaskGuarder() = default;
 
-    virtual void onReceivedErrorNotification(const std::string& _taskID){};
+    virtual void onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const&){};
     virtual void onSelfError(
         const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer){};
 
diff --git a/cpp/wedpr-computing/ppc-psi/src/psi-framework/TaskState.cpp b/cpp/wedpr-computing/ppc-psi/src/psi-framework/TaskState.cpp
@@ -210,8 +210,7 @@ void TaskState::removeGeneratedOutputFile()
     {
         return;
     }
-    PSI_LOG(INFO) << LOG_DESC("removeGeneratedFilesForFailed")
-                  << LOG_KV("task", printTaskInfo(m_task));
+    PSI_LOG(INFO) << LOG_DESC("removeGeneratedOutputFile") << LOG_KV("task", printTaskInfo(m_task));
     m_config->dataResourceLoader()->deleteResource(outputDataResource->desc());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -149,10 +149,11 @@ void OtPIRImpl::onReceiveMessage(ppc::front::PPCMessageFace::Ptr _msg)`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`152`		`-void OtPIRImpl::onReceivedErrorNotification(const std::string& _taskID)`
	`152`	`+void OtPIRImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message)`
`153`	`153`	`{`
	`154`	`+ PIR_LOG(WARNING) << LOG_DESC("onReceivedErrorNotification") << printPPCMsg(_message);`
`154`	`155`	`// finish the task while the peer is failed`
`155`		`- auto taskState = findPendingTask(_taskID);`
	`156`	`+ auto taskState = findPendingTask(_message->taskID());`
`156`	`157`	`if (taskState)`
`157`	`158`	`{`
`158`	`159`	`taskState->onPeerNotifyFinish();`
`@@ -242,7 +243,7 @@ void OtPIRImpl::handleReceivedMessage(const ppc::front::PPCMessageFace::Ptr& _me`
`242`	`243`	`{`
`243`	`244`	`case int(CommonMessageType::ErrorNotification):`
`244`	`245`	`{`
`245`		`- pir->onReceivedErrorNotification(_message->taskID());`
	`246`	`+ pir->onReceivedErrorNotification(_message);`
`246`	`247`	`break;`
`247`	`248`	`}`
`248`	`249`	`case int(CommonMessageType::PingPeer):`
Original file line number	Diff line number	Diff line change
`@@ -318,11 +318,11 @@ void CM2020PSIImpl::stop()`
`318`	`318`	`CM2020_PSI_LOG(INFO) << LOG_DESC("CM2020-PSI stopped");`
`319`	`319`	`}`
`320`	`320`
`321`		`-void CM2020PSIImpl::onReceivedErrorNotification(const std::string& _taskID)`
	`321`	`+void CM2020PSIImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message)`
`322`	`322`	`{`
`323`		`- CM2020_PSI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << LOG_KV("taskID", _taskID);`
	`323`	`+ CM2020_PSI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << printPPCMsg(_message);`
`324`	`324`	`// finish the task while the peer is failed`
`325`		`- auto taskState = findPendingTask(_taskID);`
	`325`	`+ auto taskState = findPendingTask(_message->taskID());`
`326`	`326`	`if (taskState)`
`327`	`327`	`{`
`328`	`328`	`taskState->onPeerNotifyFinish();`
`@@ -410,7 +410,7 @@ void CM2020PSIImpl::handleReceivedMessage(const ppc::front::PPCMessageFace::Ptr&`
`410`	`410`	`{`
`411`	`411`	`case int(CommonMessageType::ErrorNotification):`
`412`	`412`	`{`
`413`		`- psi->onReceivedErrorNotification(_message->taskID());`
	`413`	`+ psi->onReceivedErrorNotification(_message);`
`414`	`414`	`break;`
`415`	`415`	`}`
`416`	`416`	`case int(CommonMessageType::PingPeer):`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ void EcdhConnPSIImpl::stop()`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`-void EcdhConnPSIImpl::onReceivedErrorNotification(const std::string& _taskID) {}`
	`134`	`+void EcdhConnPSIImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const&) {}`
`135`	`135`
`136`	`136`	`void EcdhConnPSIImpl::onSelfError(`
`137`	`137`	`const std::string& _taskID, bcos::Error::Ptr _error, bool _noticePeer)`
Original file line number	Diff line number	Diff line change
`@@ -266,11 +266,11 @@ void EcdhMultiPSIImpl::checkFinishedTask()`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
`269`		`-void EcdhMultiPSIImpl::onReceivedErrorNotification(const std::string& _taskID)`
	`269`	`+void EcdhMultiPSIImpl::onReceivedErrorNotification(ppc::front::PPCMessageFace::Ptr const& _message)`
`270`	`270`	`{`
`271`		`- ECDH_MULTI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << LOG_KV("taskID", _taskID);`
	`271`	`+ ECDH_MULTI_LOG(INFO) << LOG_DESC("onReceivedErrorNotification") << printPPCMsg(_message);`
`272`	`272`	`// finish the task while the peer is failed`
`273`		`- auto taskState = findPendingTask(_taskID);`
	`273`	`+ auto taskState = findPendingTask(_message->taskID());`
`274`	`274`	`if (taskState)`
`275`	`275`	`{`
`276`	`276`	`taskState->onPeerNotifyFinish();`
`@@ -308,7 +308,7 @@ void EcdhMultiPSIImpl::executeWorker()`
`308`	`308`	`auto pop_msg = _msg.second;`
`309`	`309`	`if (pop_msg->messageType() == uint8_t(CommonMessageType::ErrorNotification))`
`310`	`310`	`{`
`311`		`- onReceivedErrorNotification(pop_msg->taskID());`
	`311`	`+ onReceivedErrorNotification(pop_msg);`
`312`	`312`	`return;`
`313`	`313`	`}`
`314`	`314`	`else if (pop_msg->messageType() == uint8_t(CommonMessageType::PingPeer))`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void EcdhMultiPSICalculator::blindData(std::string _taskID, bcos::bytes _randA)`
`95`	`95`	`uint64_t dataOffset = 0;`
`96`	`96`	`do`
`97`	`97`	`{`
`98`		`- if (m_taskState->loadFinished())`
	`98`	`+ if (m_taskState->loadFinished() \|\| m_taskState->taskDone())`
`99`	`99`	`{`
`100`	`100`	`break;`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ void EcdhMultiPSIMaster::blindData()`
`121`	`121`	`auto reader = m_taskState->reader();`
`122`	`122`	`do`
`123`	`123`	`{`
`124`		`- if (m_taskState->loadFinished())`
	`124`	`+ if (m_taskState->loadFinished() \|\| m_taskState->taskDone())`
`125`	`125`	`{`
`126`	`126`	`break;`
`127`	`127`	`}`