proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-02-01 16:49:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mgmtd: remove heavy duplication in mgmtd config read

Browse Source 
Previously each container created all it's decendents before descending into
the children and repeating the process.

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2024-01-18 17:06:45 +00:00
parent 9e34d817fc
commit fa7ff16e2b
4 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/northbound.c
View File

@ -417,10 +417,9 @@ static inline int nb_config_cb_compare(const struct nb_config_cb *a,
}
RB_GENERATE(nb_config_cbs, nb_config_cb, entry, nb_config_cb_compare);
static void nb_config_diff_add_change(struct nb_config_cbs *changes,
enum nb_cb_operation operation,
uint32_t *seq,
const struct lyd_node *dnode)
void nb_config_diff_add_change(struct nb_config_cbs *changes,
enum nb_cb_operation operation, uint32_t *seq,
const struct lyd_node *dnode)
{
struct nb_config_change *change;
@ -699,9 +698,10 @@ int nb_candidate_edit(struct nb_config *candidate, const struct nb_node *nb_node
bool in_backend, const struct yang_data *previous,
const struct yang_data *data)
{
struct lyd_node *dnode, *dep_dnode, *old_dnode, *parent;
struct lyd_node *dnode, *dep_dnode, *old_dnode;
char xpath_edit[XPATH_MAXLEN];
char dep_xpath[XPATH_MAXLEN];
struct lyd_node *parent = NULL;
uint32_t options = 0;
LY_ERR err;
@ -876,10 +876,17 @@ void nb_candidate_edit_config_changes(struct nb_config *candidate_config,
/* Find the northbound node associated to the data path. */
nb_node = nb_node_find(xpath);
if (!nb_node) {
flog_warn(EC_LIB_YANG_UNKNOWN_DATA_PATH,
"%s: unknown data path: %s", __func__, xpath);
if (error)
*error = true;
if (in_backend)
DEBUGD(&nb_dbg_cbs_config,
"%s: ignoring non-handled path: %s",
__func__, xpath);
else {
flog_warn(EC_LIB_YANG_UNKNOWN_DATA_PATH,
"%s: unknown data path: %s", __func__,
xpath);
if (error)
*error = true;
}
continue;
}
/* Find if the node to be edited is not a key node */

5
lib/northbound.h
View File

@ -1031,6 +1031,11 @@ extern void nb_candidate_edit_config_changes(struct nb_config *candidate_config,
bool in_backend, char *err_buf,
int err_bufsize, bool *error);
extern void nb_config_diff_add_change(struct nb_config_cbs *changes,
enum nb_cb_operation operation,
uint32_t *seq,
const struct lyd_node *dnode);
/*
* Delete candidate configuration changes.
*

56
mgmtd/mgmt_be_adapter.c
View File

@ -597,20 +597,6 @@ struct mgmt_be_get_adapter_config_params {
uint32_t seq;
};
/*
* Callback to store the change a node in the datastore if it should be sync'd
* to the adapter (i.e., if the adapter is subscribed to it).
*/
static void mgmt_be_iter_and_get_cfg(const char *xpath, struct lyd_node *node,
struct nb_node *nb_node, void *ctx)
{
struct mgmt_be_get_adapter_config_params *parms = ctx;
struct mgmt_be_client_adapter *adapter = parms->adapter;
if (be_is_client_interested(xpath, adapter->id, true))
nb_config_diff_created(node, &parms->seq, parms->cfg_chgs);
}
/*
* Initialize a BE client over a new connection
*/
@ -769,32 +755,32 @@ void mgmt_be_adapter_toggle_client_debug(bool set)
* Get a full set of changes for all the config that an adapter is subscribed to
* receive.
*/
int mgmt_be_get_adapter_config(struct mgmt_be_client_adapter *adapter,
struct nb_config_cbs **cfg_chgs)
void mgmt_be_get_adapter_config(struct mgmt_be_client_adapter *adapter,
struct nb_config_cbs **changes)
{
struct mgmt_be_get_adapter_config_params parms;
struct nb_config *cfg_root = mgmt_ds_get_nb_config(mm->running_ds);
const struct lyd_node *root, *dnode;
uint32_t seq = 0;
char *xpath;
assert(cfg_chgs);
/* We can't be in the middle of sending other chgs when here. */
assert(RB_EMPTY(nb_config_cbs, &adapter->cfg_chgs));
/*
* TODO: we should consider making this an assertable condition and
* guaranteeing it be true when this function is called. B/c what is
* going to happen if there are some changes being sent, and we don't
* gather a new snapshot, what new changes that came after the previous
* snapshot will then be lost?
*/
if (RB_EMPTY(nb_config_cbs, &adapter->cfg_chgs)) {
parms.adapter = adapter;
parms.cfg_chgs = &adapter->cfg_chgs;
parms.seq = 0;
*changes = &adapter->cfg_chgs;
LY_LIST_FOR (running_config->dnode, root) {
LYD_TREE_DFS_BEGIN (root, dnode) {
if (lysc_is_key(dnode->schema))
goto walk_cont;
mgmt_ds_iter_data(MGMTD_DS_RUNNING, cfg_root, "",
mgmt_be_iter_and_get_cfg, (void *)&parms);
xpath = lyd_path(dnode, LYD_PATH_STD, NULL, 0);
if (be_is_client_interested(xpath, adapter->id, true))
nb_config_diff_add_change(*changes, NB_CB_CREATE, &seq, dnode);
else
LYD_TREE_DFS_continue = 1; /* skip any subtree */
free(xpath);
walk_cont:
LYD_TREE_DFS_END(root, dnode);
}
}
*cfg_chgs = &adapter->cfg_chgs;
return 0;
}
uint64_t mgmt_be_interested_clients(const char *xpath, bool config)

4
mgmtd/mgmt_be_adapter.h
View File

@ -157,8 +157,8 @@ extern const char *mgmt_be_client_id2name(enum mgmt_be_client_id id);
extern void mgmt_be_adapter_toggle_client_debug(bool set);
/* Fetch backend adapter config. */
extern int mgmt_be_get_adapter_config(struct mgmt_be_client_adapter *adapter,
struct nb_config_cbs **cfg_chgs);
extern void mgmt_be_get_adapter_config(struct mgmt_be_client_adapter *adapter,
struct nb_config_cbs **changes);
/* Create/destroy a transaction. */
extern int mgmt_be_send_txn_req(struct mgmt_be_client_adapter *adapter,