proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 22:07:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: simplify handling of the sysrepo startup configuration

Browse Source 
In the new Sysrepo, all SR_EV_ENABLED notifications are followed by
SR_EV_DONE notifications (assuming no errors occur), so there's no
need to special case the SR_EV_ENABLED event anymore (e.g. do full
transactions in one step).

While here, add a few more guarded debug messages to facilitate
troubleshooting.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2020-09-11 22:39:50 -03:00
parent 7dac19f7de
commit bbeaa0333c
1 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/northbound_sysrepo.c
View File

@ -174,6 +174,9 @@ static int frr_sr_process_change(struct nb_config *candidate,
xpath = sr_data->xpath; xpath = sr_data->xpath;
DEBUGD(&nb_dbg_client_sysrepo, "sysrepo: processing change [xpath %s]",
xpath);
/* Non-presence container - nothing to do. */ /* Non-presence container - nothing to do. */
if (sr_data->type == SR_CONTAINER_T) if (sr_data->type == SR_CONTAINER_T)
return NB_OK; return NB_OK;
@ -235,8 +238,7 @@ static int frr_sr_process_change(struct nb_config *candidate,
} }
static int frr_sr_config_change_cb_prepare(sr_session_ctx_t *session, static int frr_sr_config_change_cb_prepare(sr_session_ctx_t *session,
const char *module_name, const char *module_name)
bool startup_config)
{ {
sr_change_iter_t *it; sr_change_iter_t *it;
int ret; int ret;
@ -275,33 +277,17 @@ static int frr_sr_config_change_cb_prepare(sr_session_ctx_t *session,
transaction = NULL; transaction = NULL;
context.client = NB_CLIENT_SYSREPO; context.client = NB_CLIENT_SYSREPO;
if (startup_config) { /*
/* * Validate the configuration changes and allocate all resources
* sysrepod sends the entire startup configuration using a * required to apply them.
* single event (SR_EV_ENABLED). This means we need to perform */
* the full two-phase commit protocol in one go here. ret = nb_candidate_commit_prepare(&context, candidate, NULL,
*/ &transaction, errmsg, sizeof(errmsg));
ret = nb_candidate_commit(&context, candidate, true, NULL, NULL, if (ret != NB_OK && ret != NB_ERR_NO_CHANGES)
errmsg, sizeof(errmsg)); flog_warn(
if (ret != NB_OK && ret != NB_ERR_NO_CHANGES) EC_LIB_LIBSYSREPO,
flog_warn( "%s: failed to prepare configuration transaction: %s (%s)",
EC_LIB_LIBSYSREPO, __func__, nb_err_name(ret), errmsg);
"%s: failed to apply startup configuration: %s (%s)",
__func__, nb_err_name(ret), errmsg);
} else {
/*
* Validate the configuration changes and allocate all resources
* required to apply them.
*/
ret = nb_candidate_commit_prepare(&context, candidate, NULL,
&transaction, errmsg,
sizeof(errmsg));
if (ret != NB_OK && ret != NB_ERR_NO_CHANGES)
flog_warn(
EC_LIB_LIBSYSREPO,
"%s: failed to prepare configuration transaction: %s (%s)",
__func__, nb_err_name(ret), errmsg);
}
if (!transaction) if (!transaction)
nb_config_free(candidate); nb_config_free(candidate);
@ -360,11 +346,8 @@ static int frr_sr_config_change_cb(sr_session_ctx_t *session,
{ {
switch (sr_ev) { switch (sr_ev) {
case SR_EV_ENABLED: case SR_EV_ENABLED:
return frr_sr_config_change_cb_prepare(session, module_name,
true);
case SR_EV_CHANGE: case SR_EV_CHANGE:
return frr_sr_config_change_cb_prepare(session, module_name, return frr_sr_config_change_cb_prepare(session, module_name);
false);
case SR_EV_DONE: case SR_EV_DONE:
return frr_sr_config_change_cb_apply(session, module_name); return frr_sr_config_change_cb_apply(session, module_name);
case SR_EV_ABORT: case SR_EV_ABORT:
@ -563,6 +546,10 @@ static void frr_sr_subscribe_config(struct yang_module *module)
{ {
int ret; int ret;
DEBUGD(&nb_dbg_client_sysrepo,
"sysrepo: subscribing for configuration changes made in the '%s' module",
module->name);
ret = sr_module_change_subscribe( ret = sr_module_change_subscribe(
session, module->name, NULL, frr_sr_config_change_cb, NULL, 0, session, module->name, NULL, frr_sr_config_change_cb, NULL, 0,
SR_SUBSCR_DEFAULT | SR_SUBSCR_ENABLED | SR_SUBSCR_NO_THREAD, SR_SUBSCR_DEFAULT | SR_SUBSCR_ENABLED | SR_SUBSCR_NO_THREAD,
@ -586,7 +573,7 @@ static int frr_sr_subscribe_state(const struct lys_node *snode, void *arg)
nb_node = snode->priv; nb_node = snode->priv;
DEBUGD(&nb_dbg_client_sysrepo, "%s: providing data to '%s'", __func__, DEBUGD(&nb_dbg_client_sysrepo, "sysrepo: providing data to '%s'",
nb_node->xpath); nb_node->xpath);
ret = sr_oper_get_items_subscribe( ret = sr_oper_get_items_subscribe(
@ -610,7 +597,7 @@ static int frr_sr_subscribe_rpc(const struct lys_node *snode, void *arg)
nb_node = snode->priv; nb_node = snode->priv;
DEBUGD(&nb_dbg_client_sysrepo, "%s: providing RPC to '%s'", __func__, DEBUGD(&nb_dbg_client_sysrepo, "sysrepo: providing RPC to '%s'",
nb_node->xpath); nb_node->xpath);
ret = sr_rpc_subscribe(session, nb_node->xpath, frr_sr_config_rpc_cb, ret = sr_rpc_subscribe(session, nb_node->xpath, frr_sr_config_rpc_cb,