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

mgmtd: allow dest DS "running" if implicit lock+commit

Browse source 
Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2024-09-14 06:52:43 -04:00
parent 0913d9fc0e
commit d57a6f761e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mgmtd/mgmt_fe_adapter.c
View file

@ -1406,7 +1406,12 @@ static void fe_adapter_handle_edit(struct mgmt_fe_session_ctx *session,
bool lock, commit;
int ret;
if (msg->datastore != MGMT_MSG_DATASTORE_CANDIDATE) {
lock = CHECK_FLAG(msg->flags, EDIT_FLAG_IMPLICIT_LOCK);
commit = CHECK_FLAG(msg->flags, EDIT_FLAG_IMPLICIT_COMMIT);
if (lock && commit && msg->datastore == MGMT_MSG_DATASTORE_RUNNING)
;
else if (msg->datastore != MGMT_MSG_DATASTORE_CANDIDATE) {
fe_adapter_send_error(session, msg->req_id, false, -EINVAL,
"Unsupported datastore");
return;
@ -1427,9 +1432,6 @@ static void fe_adapter_handle_edit(struct mgmt_fe_session_ctx *session,
rds_ctx = mgmt_ds_get_ctx_by_id(mm, rds_id);
assert(rds_ctx);
lock = CHECK_FLAG(msg->flags, EDIT_FLAG_IMPLICIT_LOCK);
commit = CHECK_FLAG(msg->flags, EDIT_FLAG_IMPLICIT_COMMIT);
if (lock) {
if (mgmt_fe_session_write_lock_ds(ds_id, ds_ctx, session)) {
fe_adapter_send_error(session, msg->req_id, false,