mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

[#3449] clean up on destructor

Browse Source
This commit is contained in:
Razvan Becheriu
2024-06-26 16:59:27 +03:00
parent 0fe6f2e381
commit 6419c57b9d
7 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/dhcp4/tests/dhcp4_test_utils.h
View File

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

6
src/bin/dhcp6/tests/dhcp6_test_utils.h
View File

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

5
src/hooks/dhcp/high_availability/ha_callouts.cc
View File

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

3
src/hooks/dhcp/high_availability/ha_impl.cc
View File

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

1
src/hooks/dhcp/high_availability/ha_impl.h
View File

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

8
src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc
View File

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

8
src/hooks/dhcp/pgsql_cb/pgsql_cb_callouts.cc
View File

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