Skip to content

Dynamic backends #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abudnik wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Dynamic backends #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c67210
ioserv: dynamically parse & insert backend on DNET_BACKEND_ENABLE com…
abudnik May 26, 2016
0d51dd8
tests: backends: add backend to ioserv.conf after ioserv launch and e…
abudnik May 26, 2016
26145ff
ioserv: fixed incorrect detection of backends count in dnet_server_io…
abudnik May 30, 2016
6c2d29b
tests: added description of m_serializable var in config_data class
abudnik May 30, 2016
b919697
indentation fix
abudnik Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions example/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,28 @@ void parse_options(config_data *data, const config &options)
}
}

std::shared_ptr<dnet_backend_info> dnet_parse_backend(config_data *data, uint32_t backend_id, const config &backend)
{
auto info = std::make_shared<dnet_backend_info>(data->logger, backend_id);

info->enable_at_start = backend.at<bool>("enable", true);
info->read_only_at_start = backend.at<bool>("read_only", false);
info->state = DNET_BACKEND_DISABLED;
info->history = backend.at("history", std::string());

if (info->enable_at_start) {
// It's parsed to check configuration at start
// It will be reparsed again at backend's initialization anyway
info->parse(data, backend);
}

return info;
}

void parse_backends(config_data *data, const config &backends)
{
std::set<uint32_t> backends_ids;
auto &backends_info = data->backends->backends;
auto config_backends = data->backends;

for (size_t index = 0; index < backends.size(); ++index) {
const config backend = backends.at(index);
Expand All @@ -327,19 +345,11 @@ void parse_backends(config_data *data, const config &backends)
<< " duplicates one of previous backend_id";
}

while (backend_id + 1 > backends_info.size())
backends_info.emplace_back(data->logger, backends_info.size());

dnet_backend_info &info = backends_info[backend_id];
info.enable_at_start = backend.at<bool>("enable", true);
info.read_only_at_start = backend.at<bool>("read_only", false);
info.state = DNET_BACKEND_DISABLED;
info.history = backend.at("history", std::string());

if (info.enable_at_start) {
// It's parsed to check configuration at start
// It will be reparsed again at backend's initialization anyway
info.parse(data, backend);
if (!config_backends->get_backend(backend_id)) {
auto info = dnet_parse_backend(data, backend_id, backend);
if (info) {
config_backends->add_backend(info);
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion example/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ struct config_data : public dnet_config_data
std::mutex parser_mutex;
std::shared_ptr<config_parser> parser;
dnet_time config_timestamp;
dnet_backend_info_list backends_guard;
dnet_backend_info_manager backends_guard;
std::string logger_value;
ioremap::elliptics::logger_base logger_base;
ioremap::elliptics::logger logger;
Expand All @@ -363,6 +363,8 @@ struct config_data : public dnet_config_data
std::unique_ptr<monitor::monitor_config> monitor_config;
};

std::shared_ptr<dnet_backend_info> dnet_parse_backend(config_data *data, uint32_t backend_id, const config &backend);

} } } // namespace ioremap::elliptics::config

#endif // CONFIG_HPP
Loading