[#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 a8a90c4fd3f3ff6740170ac7326a49567e7565d0..9408d2a980e8f6cde47b23db1db38ac6808489b5 100644 (file)
--- 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 c38966d2e780abe233a60485ba2553846027d355..5fc0292252ec14ea745203681129a9d9b52877ae 100644 (file)
--- 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 ec65d20a19c1fe032997893a2e5f32a688d031b4..51c49e29e222451ffad5703c019e8c503aecb67d 100644 (file)
--- 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 <cstddef>
 #include <log/message_types.h>
@@ -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 4ab706085082ad22263817a65b707e5d3093fe39..0e7ec4d0f77cf516681d561d023b824b6ddcf373 100644 (file)
--- 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 b0ee95e32481c40734ca069fe48161285f63273c..cb1c4d33d8899e0633da626728f8846e9f11bae3 100644 (file)
--- 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 bcb9d3992d9247eb063701736b909cd55b0eeaa5..e17bb37b6553528a65fe98a2594cbcf69059dfb9 100644 (file)
--- 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 bd33d050336aa39f84fed30b0f09315d0b249f8f..5ef54cfb0267d50e586a211c75827a25e35c59ec 100644 (file)
--- 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 <cstddef>
 #include <log/message_types.h>
@@ -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 f9442963bf5c1f77fefec7158153ea5f14483d9b..1690959ec1ec468be501afac3607641b207bbdff 100644 (file)
--- 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 6153aac5d37f72bfc9864b6998e74f047247929f..e275ae5da98a78451812ae961ea05b175f7da56b 100644 (file)
--- 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.