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.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.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.