matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

vty: fix working in file-lock mode

Browse source 
When the configuration node is entered in file-lock mode, candidate
and running datastores are locked. Any configuration change is followed
by an implicit commit which leads to a crash of mgmtd, because double
lock is prohibited by an assert. When working in file-lock mode, we
shouldn't do implicit commits which is disabled by allowing pending
configuration changes.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2023-09-28 02:41:16 +03:00
parent b8ebb7fc62
commit d3aa9adb8d
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/vty.c
View file

@ -2890,6 +2890,12 @@ int vty_config_enter(struct vty *vty, bool private_config, bool exclusive,
} }
assert(vty->mgmt_locked_candidate_ds); assert(vty->mgmt_locked_candidate_ds);
assert(vty->mgmt_locked_running_ds); assert(vty->mgmt_locked_running_ds);
/*
* As datastores are locked explicitly, we don't need implicit
* commits and should allow pending changes.
*/
vty->pending_allowed = true;
} }
vty->node = CONFIG_NODE; vty->node = CONFIG_NODE;
@ -2946,6 +2952,8 @@ int vty_config_node_exit(struct vty *vty)
/* TODO: could we check for un-commited changes here? */ /* TODO: could we check for un-commited changes here? */
vty->pending_allowed = false;
if (vty->mgmt_locked_running_ds) if (vty->mgmt_locked_running_ds)
vty_mgmt_unlock_running_inline(vty); vty_mgmt_unlock_running_inline(vty);