From d9ff95da4967d5db8b0134bce43e7afc6d5c0cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 7 Jun 2021 13:29:27 -0400
Subject: [PATCH] Revert "dhtrunner: force execution of pending ops on
shutdown"
This reverts commit c8a0b443f3117e2fa1343d2cb3c091f502b1a24e.
---
src/dhtrunner.cpp | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp
index 0157f631..b43854be 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -294,11 +294,6 @@ DhtRunner::shutdown(ShutdownCallback cb, bool stop) {
if (dht_)
dht_->shutdown(onShutdown, stop);
});
- // Force execution of pending ops
- if (getStatus() == NodeStatus::Connecting) {
- status4 = NodeStatus::Disconnected;
- status6 = NodeStatus::Disconnected;
- }
cv.notify_all();
}
@@ -373,7 +368,6 @@ DhtRunner::join()
{
std::lock_guard<std::mutex> lck(dht_mtx);
resetDht();
- std::lock_guard<std::mutex> lck2(storage_mtx);
status4 = NodeStatus::Disconnected;
status6 = NodeStatus::Disconnected;
}
@@ -709,11 +703,8 @@ DhtRunner::loop_()
NodeStatus nstatus4 = dht->updateStatus(AF_INET);
NodeStatus nstatus6 = dht->updateStatus(AF_INET6);
if (nstatus4 != status4 || nstatus6 != status6) {
- {
- std::lock_guard<std::mutex> lck(storage_mtx);
- status4 = nstatus4;
- status6 = nstatus6;
- }
+ status4 = nstatus4;
+ status6 = nstatus6;
if (statusCb)
statusCb(status4, status6);
}
--
GitLab