From: Thomas Markwalder Date: Wed, 4 Nov 2020 20:07:28 +0000 (-0500) Subject: [#1435] Backported #1431 to v1_8_0 X-Git-Tag: Kea-1.8.1~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c2f29940e464b738c46ac04a2b5fdf24eb9fdc8;p=thirdparty%2Fkea.git [#1435] Backported #1431 to v1_8_0 modified: ChangeLog src/bin/dhcp4/ctrl_dhcp4_srv.cc src/bin/dhcp4/dhcp4_messages.cc src/bin/dhcp4/dhcp4_messages.h src/bin/dhcp4/dhcp4_messages.mes src/bin/dhcp6/ctrl_dhcp6_srv.cc src/bin/dhcp6/dhcp6_messages.cc src/bin/dhcp6/dhcp6_messages.h src/bin/dhcp6/dhcp6_messages.mes --- diff --git a/ChangeLog b/ChangeLog index a8a90c4fd3..9408d2a980 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1798. [func] razvan,tmark + Removed "Multithreading is experimental" warning log message + from kea-dhcp4 and kea-dhcp6 servers. + (Gitlab #1435,#1431) + Kea 1.8.0 (stable) released on Aug 26, 2020 1797. [build] razvan diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc index c38966d2e7..5fc0292252 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc @@ -932,9 +932,6 @@ ControlledDhcpv4Srv::processConfig(isc::data::ConstElementPtr config) { // @todo This should be fixed. try { CfgMultiThreading::apply(CfgMgr::instance().getStagingCfg()->getDHCPMultiThreading()); - if (MultiThreadingMgr::instance().getMode()) { - LOG_FATAL(dhcp4_logger, DHCP4_MULTI_THREADING_WARNING); - } } catch (const std::exception& ex) { err << "Error applying multi threading settings: " << ex.what(); diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc index ec65d20a19..51c49e29e2 100644 --- a/src/bin/dhcp4/dhcp4_messages.cc +++ b/src/bin/dhcp4/dhcp4_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Fri Aug 14 2020 21:33 +// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Wed Nov 04 2020 14:29 #include #include @@ -85,7 +85,6 @@ extern const isc::log::MessageID DHCP4_INIT_REBOOT = "DHCP4_INIT_REBOOT"; extern const isc::log::MessageID DHCP4_LEASE_ADVERT = "DHCP4_LEASE_ADVERT"; extern const isc::log::MessageID DHCP4_LEASE_ALLOC = "DHCP4_LEASE_ALLOC"; extern const isc::log::MessageID DHCP4_MULTI_THREADING_INFO = "DHCP4_MULTI_THREADING_INFO"; -extern const isc::log::MessageID DHCP4_MULTI_THREADING_WARNING = "DHCP4_MULTI_THREADING_WARNING"; extern const isc::log::MessageID DHCP4_NCR_CREATE = "DHCP4_NCR_CREATE"; extern const isc::log::MessageID DHCP4_NCR_CREATION_FAILED = "DHCP4_NCR_CREATION_FAILED"; extern const isc::log::MessageID DHCP4_NOT_RUNNING = "DHCP4_NOT_RUNNING"; @@ -238,7 +237,6 @@ const char* values[] = { "DHCP4_LEASE_ADVERT", "%1: lease %2 will be advertised", "DHCP4_LEASE_ALLOC", "%1: lease %2 has been allocated for %3 seconds", "DHCP4_MULTI_THREADING_INFO", "enabled: %1, number of threads: %2, queue size: %3", - "DHCP4_MULTI_THREADING_WARNING", "The multi-threading feature is experimental. Don't use in production environment.", "DHCP4_NCR_CREATE", "%1: DDNS updates enabled, therefore sending name change requests", "DHCP4_NCR_CREATION_FAILED", "%1: failed to generate name change requests for DNS: %2", "DHCP4_NOT_RUNNING", "DHCPv4 server is not running", diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h index 4ab7060850..0e7ec4d0f7 100644 --- a/src/bin/dhcp4/dhcp4_messages.h +++ b/src/bin/dhcp4/dhcp4_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Fri Aug 14 2020 21:33 +// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Wed Nov 04 2020 14:29 #ifndef DHCP4_MESSAGES_H #define DHCP4_MESSAGES_H @@ -86,7 +86,6 @@ extern const isc::log::MessageID DHCP4_INIT_REBOOT; extern const isc::log::MessageID DHCP4_LEASE_ADVERT; extern const isc::log::MessageID DHCP4_LEASE_ALLOC; extern const isc::log::MessageID DHCP4_MULTI_THREADING_INFO; -extern const isc::log::MessageID DHCP4_MULTI_THREADING_WARNING; extern const isc::log::MessageID DHCP4_NCR_CREATE; extern const isc::log::MessageID DHCP4_NCR_CREATION_FAILED; extern const isc::log::MessageID DHCP4_NOT_RUNNING; diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index b0ee95e324..cb1c4d33d8 100644 --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@ -463,9 +463,6 @@ lifetime. This is a message listing some information about the multi-threading parameters with which the server is running. -% DHCP4_MULTI_THREADING_WARNING The multi-threading feature is experimental. Don't use in production environment. -This is a message warning about the experimental multi-threading feature. - % DHCP4_NCR_CREATE %1: DDNS updates enabled, therefore sending name change requests This debug message is issued when the server is starting to send name change requests to the D2 module to update records for the client diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc index bcb9d3992d..e17bb37b65 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc @@ -953,9 +953,6 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) { // @todo This should be fixed. try { CfgMultiThreading::apply(CfgMgr::instance().getStagingCfg()->getDHCPMultiThreading()); - if (MultiThreadingMgr::instance().getMode()) { - LOG_FATAL(dhcp6_logger, DHCP6_MULTI_THREADING_WARNING); - } } catch (const std::exception& ex) { err << "Error applying multi threading settings: " << ex.what(); diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc index bd33d05033..5ef54cfb02 100644 --- a/src/bin/dhcp6/dhcp6_messages.cc +++ b/src/bin/dhcp6/dhcp6_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Fri Aug 14 2020 21:36 +// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Wed Nov 04 2020 14:30 #include #include @@ -87,7 +87,6 @@ extern const isc::log::MessageID DHCP6_LEASE_NA_WITHOUT_DUID = "DHCP6_LEASE_NA_W extern const isc::log::MessageID DHCP6_LEASE_PD_WITHOUT_DUID = "DHCP6_LEASE_PD_WITHOUT_DUID"; extern const isc::log::MessageID DHCP6_LEASE_RENEW = "DHCP6_LEASE_RENEW"; extern const isc::log::MessageID DHCP6_MULTI_THREADING_INFO = "DHCP6_MULTI_THREADING_INFO"; -extern const isc::log::MessageID DHCP6_MULTI_THREADING_WARNING = "DHCP6_MULTI_THREADING_WARNING"; extern const isc::log::MessageID DHCP6_NOT_RUNNING = "DHCP6_NOT_RUNNING"; extern const isc::log::MessageID DHCP6_NO_INTERFACES = "DHCP6_NO_INTERFACES"; extern const isc::log::MessageID DHCP6_NO_SOCKETS_OPEN = "DHCP6_NO_SOCKETS_OPEN"; @@ -240,7 +239,6 @@ const char* values[] = { "DHCP6_LEASE_PD_WITHOUT_DUID", "%1: lease for prefix %2/%3 does not have a DUID", "DHCP6_LEASE_RENEW", "%1: lease for address %2 and iaid=%3 has been allocated", "DHCP6_MULTI_THREADING_INFO", "enabled: %1, number of threads: %2, queue size: %3", - "DHCP6_MULTI_THREADING_WARNING", "The multi-threading feature is experimental. Don't use in production environment.", "DHCP6_NOT_RUNNING", "IPv6 DHCP server is not running", "DHCP6_NO_INTERFACES", "failed to detect any network interfaces", "DHCP6_NO_SOCKETS_OPEN", "no interface configured to listen to DHCP traffic", diff --git a/src/bin/dhcp6/dhcp6_messages.h b/src/bin/dhcp6/dhcp6_messages.h index f9442963bf..1690959ec1 100644 --- a/src/bin/dhcp6/dhcp6_messages.h +++ b/src/bin/dhcp6/dhcp6_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Fri Aug 14 2020 21:36 +// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Wed Nov 04 2020 14:30 #ifndef DHCP6_MESSAGES_H #define DHCP6_MESSAGES_H @@ -88,7 +88,6 @@ extern const isc::log::MessageID DHCP6_LEASE_NA_WITHOUT_DUID; extern const isc::log::MessageID DHCP6_LEASE_PD_WITHOUT_DUID; extern const isc::log::MessageID DHCP6_LEASE_RENEW; extern const isc::log::MessageID DHCP6_MULTI_THREADING_INFO; -extern const isc::log::MessageID DHCP6_MULTI_THREADING_WARNING; extern const isc::log::MessageID DHCP6_NOT_RUNNING; extern const isc::log::MessageID DHCP6_NO_INTERFACES; extern const isc::log::MessageID DHCP6_NO_SOCKETS_OPEN; diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes index 6153aac5d3..e275ae5da9 100644 --- a/src/bin/dhcp6/dhcp6_messages.mes +++ b/src/bin/dhcp6/dhcp6_messages.mes @@ -510,9 +510,6 @@ IAID. This is a message listing some information about the multi-threading parameters with which the server is running. -% DHCP6_MULTI_THREADING_WARNING The multi-threading feature is experimental. Don't use in production environment. -This is a message warning about the experimental multi-threading feature. - % DHCP6_NOT_RUNNING IPv6 DHCP server is not running A warning message is issued when an attempt is made to shut down the IPv6 DHCP server but it is not running.