[#4206] fixed data race

diff --git a/src/hooks/dhcp/ping_check/ping_check_mgr.cc b/src/hooks/dhcp/ping_check/ping_check_mgr.cc
index 0a9231292a90942f3e8a4019223d0ebb6863bee2..472e4a8168228fe8e52b7c1aa8f4eaac75c7ed55 100644 (file)
--- a/src/hooks/dhcp/ping_check/ping_check_mgr.cc
+++ b/src/hooks/dhcp/ping_check/ping_check_mgr.cc
@@ -722,6 +722,10 @@ PingCheckMgr::stop() {
     // Cancel the expiration timer.
     cancelExpirationTimer();
 
+    if (thread_pool_) {
+        thread_pool_->pause();
+    }
+
     if (channel_) {
         channel_->close();
     }

diff --git a/src/hooks/dhcp/ping_check/tests/ping_check_mgr_unittests.cc b/src/hooks/dhcp/ping_check/tests/ping_check_mgr_unittests.cc
index af70317d7e917c80dc149efed8dcb60e94686c6b..b370e03d8cea94252deb52f965285441583b65e0 100644 (file)
--- a/src/hooks/dhcp/ping_check/tests/ping_check_mgr_unittests.cc
+++ b/src/hooks/dhcp/ping_check/tests/ping_check_mgr_unittests.cc
@@ -1482,6 +1482,9 @@ public:
 
         // We should have one free that matches our lease query pair.
         compareLeaseQueryPairs(frees_);
+
+        // Stop the mgr.
+        ASSERT_NO_THROW(mgr_->stop());
     }
 
     /// @brief Exercises shouldPing().