[#3449] clean up on destructor

Author: Razvan Becheriu

src/bin/dhcp4/tests/dhcp4_test_utils.h

@@ -209,16 +209,7 @@ class NakedDhcpv4Srv: public Dhcpv4Srv {
         fake_received_.push_back(pkt);
     }
 
-    virtual ~NakedDhcpv4Srv() {
-        // Close the lease database
-        isc::dhcp::LeaseMgrFactory::destroy();
-
-        getIOService()->restart();
-        try {
-            getIOService()->poll();
-        } catch (...) {
-        }
-    }
+    virtual ~NakedDhcpv4Srv() = default;
 
     /// @brief Runs processing DHCPDISCOVER.
     ///

src/bin/dhcp6/tests/dhcp6_test_utils.h

@@ -216,11 +216,7 @@ class NakedDhcpv6Srv: public isc::dhcp::Dhcpv6Srv {
         fake_received_.push_back(pkt);
     }
 
-    virtual ~NakedDhcpv6Srv() {
-        // Close the lease database
-        isc::dhcp::LeaseMgrFactory::destroy();
-        getIOService()->stopAndPoll();
-    }
+    virtual ~NakedDhcpv6Srv() = default;
 
     /// @brief Processes incoming Solicit message.
     ///

src/hooks/dhcp/high_availability/ha_callouts.cc

@@ -429,11 +429,8 @@ int load(LibraryHandle& handle) {
 /// @return 0 if deregistration was successful, 1 otherwise
 int unload() {
     if (impl) {
-        IOServicePtr io_service = impl->getIOService();
-        IOServiceMgr::instance().unregisterIOService(io_service);
-        io_service->stopAndPoll();
+        IOServiceMgr::instance().unregisterIOService(impl->getIOService());
         impl.reset();
-        io_service->stopAndPoll();
     }
     LOG_INFO(ha_logger, HA_DEINIT_OK);
     return (0);

src/hooks/dhcp/high_availability/ha_impl.cc

@@ -66,6 +66,9 @@ HAImpl::~HAImpl() {
         // than relying on destruction order.
         service->stopClientAndListener();
     }
+    config_.reset();
+    services_.reset(new HAServiceMapper());
+    io_service_->stopAndPoll();
 }
 
 void

src/hooks/dhcp/high_availability/ha_impl.h

@@ -245,7 +245,6 @@ class HAImpl : public boost::noncopyable {
 
     /// @brief Pointer to the high availability services (state machines).
     HAServiceMapperPtr services_;
-
 };
 
 /// @brief Pointer to the High Availability hooks library implementation.

src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc

@@ -94,9 +94,11 @@ int unload() {
     // Unregister the factories and remove MySQL backends
     isc::dhcp::MySqlConfigBackendDHCPv4::unregisterBackendType();
     isc::dhcp::MySqlConfigBackendDHCPv6::unregisterBackendType();
-    IOServiceMgr::instance().unregisterIOService(isc::dhcp::MySqlConfigBackendImpl::getIOService());
-    if (isc::dhcp::MySqlConfigBackendImpl::getIOService()) {
-        isc::dhcp::MySqlConfigBackendImpl::getIOService()->stopAndPoll();
+    IOServicePtr io_service = isc::dhcp::MySqlConfigBackendImpl::getIOService();
+    if (io_service) {
+        IOServiceMgr::instance().unregisterIOService(io_service);
+        io_service->stopAndPoll();
+        isc::dhcp::MySqlConfigBackendImpl::setIOService(IOServicePtr());
     }
     return (0);
 }

src/hooks/dhcp/pgsql_cb/pgsql_cb_callouts.cc

@@ -94,9 +94,11 @@ int unload() {
     // Unregister the factories and remove PostgreSQL backends
     isc::dhcp::PgSqlConfigBackendDHCPv4::unregisterBackendType();
     isc::dhcp::PgSqlConfigBackendDHCPv6::unregisterBackendType();
-    IOServiceMgr::instance().unregisterIOService(isc::dhcp::PgSqlConfigBackendImpl::getIOService());
-    if (isc::dhcp::PgSqlConfigBackendImpl::getIOService()) {
-        isc::dhcp::PgSqlConfigBackendImpl::getIOService()->stopAndPoll();
+    IOServicePtr io_service = isc::dhcp::PgSqlConfigBackendImpl::getIOService();
+    if (io_service) {
+        IOServiceMgr::instance().unregisterIOService(io_service);
+        io_service->stopAndPoll();
+        isc::dhcp::PgSqlConfigBackendImpl::setIOService(IOServicePtr());
     }
     return (0);
 }