mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 05:55:28 +00:00
Code Issues Releases Wiki Activity

[#1188] addressed review

Browse Source
This commit is contained in:
Razvan Becheriu
2020-04-29 19:43:24 +03:00
parent ed504b1ce1
commit 6b8a679adf
5 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View File

@@ -415,6 +415,18 @@ ControlledDhcpv4Srv::commandConfigSetHandler(const string&,
CfgMgr::instance().getCurrentCfg()->applyLoggingCfg();
}
// Configure multi threading
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();
return (isc::config::createAnswer(CONTROL_RESULT_ERROR, err.str()));
}
return (result);
}
@@ -584,6 +596,8 @@ ControlledDhcpv4Srv::commandConfigBackendPullHandler(const std::string&,
return (createAnswer(CONTROL_RESULT_EMPTY, "No config backend."));
}
MultiThreadingCriticalSection cs;
// Reschedule the periodic CB fetch.
if (TimerMgr::instance()->isTimerRegistered("Dhcp4CBFetchTimer")) {
TimerMgr::instance()->cancel("Dhcp4CBFetchTimer");
@@ -883,18 +897,6 @@ ControlledDhcpv4Srv::processConfig(isc::data::ConstElementPtr config) {
// operation.
}
// Configure multi threading
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();
return (isc::config::createAnswer(CONTROL_RESULT_ERROR, err.str()));
}
return (answer);
}
@@ -1176,6 +1178,8 @@ ControlledDhcpv4Srv::dbLostCallback(ReconnectCtlPtr db_reconnect_ctl) {
void
ControlledDhcpv4Srv::cbFetchUpdates(const SrvConfigPtr& srv_cfg,
boost::shared_ptr<unsigned> failure_count) {
MultiThreadingCriticalSection cs;
try {
// Fetch any configuration backend updates since our last fetch.
server_->getCBControl()->databaseConfigFetch(srv_cfg,

28
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

@@ -418,6 +418,18 @@ ControlledDhcpv6Srv::commandConfigSetHandler(const string&,
CfgMgr::instance().getCurrentCfg()->applyLoggingCfg();
}
// Configure multi threading
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();
return (isc::config::createAnswer(CONTROL_RESULT_ERROR, err.str()));
}
return (result);
}
@@ -587,6 +599,8 @@ ControlledDhcpv6Srv::commandConfigBackendPullHandler(const std::string&,
return (createAnswer(CONTROL_RESULT_EMPTY, "No config backend."));
}
MultiThreadingCriticalSection cs;
// Reschedule the periodic CB fetch.
if (TimerMgr::instance()->isTimerRegistered("Dhcp6CBFetchTimer")) {
TimerMgr::instance()->cancel("Dhcp6CBFetchTimer");
@@ -904,18 +918,6 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) {
// operation.
}
// Configure multi threading
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();
return (isc::config::createAnswer(CONTROL_RESULT_ERROR, err.str()));
}
return (answer);
}
@@ -1194,6 +1196,8 @@ ControlledDhcpv6Srv::dbLostCallback(ReconnectCtlPtr db_reconnect_ctl) {
void
ControlledDhcpv6Srv::cbFetchUpdates(const SrvConfigPtr& srv_cfg,
boost::shared_ptr<unsigned> failure_count) {
MultiThreadingCriticalSection cs;
try {
// Fetch any configuration backend updates since our last fetch.
server_->getCBControl()->databaseConfigFetch(srv_cfg,

2
src/lib/dhcpsrv/cfg_multi_threading.h
View File

@@ -26,7 +26,7 @@ public:
/// @param[in] value The multi-threading configuration
/// @param[out] enabled The enabled flag
/// @param[out] thread_count The thread count
/// @param[out] queue size The queue size
/// @param[out] queue_size The queue size
static void extract(data::ConstElementPtr value, bool& enabled,
uint32_t& thread_count, uint32_t& queue_size);
};

8
src/lib/dhcpsrv/parsers/multi_threading_config_parser.h
View File

@@ -17,9 +17,13 @@ namespace dhcp {
class MultiThreadingConfigParser : public isc::data::SimpleParser {
public:
/// @brief parses JSON structure
/// @brief parses JSON structure.
///
/// @param srv_cfg parsed value will be stored here
/// This function stores the 'multi-threading' settings in the server
/// configuration and applies the MT mode so that is can be checked when
/// parsing 'hooks-libraries'.
///
/// @param srv_cfg parsed value will be stored here.
/// @param value a JSON map that contains multi-threading parameters.
void parse(SrvConfig& srv_cfg, const isc::data::ConstElementPtr& value);
};

3
src/lib/dhcpsrv/tests/multi_threading_config_parser_unittest.cc
View File

@@ -92,6 +92,8 @@ TEST_F(MultiThreadingConfigParserTest, validContent) {
ADD_FAILURE() << "parser threw an exception: " << ex.what();
}
EXPECT_EQ(MultiThreadingMgr::instance().getMode(), enabled);
multi_threading_config = srv_config.getDHCPMultiThreading();
// Verify the resultant configuration.
ASSERT_TRUE(multi_threading_config);
@@ -103,7 +105,6 @@ TEST_F(MultiThreadingConfigParserTest, validContent) {
CfgMultiThreading::extract(multi_threading_config, enabled,
thread_count, queue_size);
EXPECT_EQ(MultiThreadingMgr::instance().getMode(), enabled);
EXPECT_TRUE(multi_threading_config->equals(*config_elems));
}