Skip to content

Commit b12b4c2

Browse files
committed
mgmtd: remove bogus "hedge" code which corrupted active candidate DS
Say you have 2 mgmtd frontend sessions (2 vtysh's) the first one is long running and is actively changing the global candidate datastore (DS), the second one starts and exits, this code would then copy running back over the candidate, blowing away any changes made by the first session. (the long running session could technically be any user) Instead we need to trust the various cleanup code that already exits. For example in the commit_cfg_reply on success candidate is copied to running, and on failure *for implicit commit* running is copied back to candidate clearing the change. This leaves the non-implicit configuration changes in this case we actually want candidate to keep it's changes in transactional cases, in the other case of pending commit during a file read the code restores candidate (if needed) on exit from "config terminal", with this call stack: vty_config_node_exit() nb_cli_pending_commit_check() nb_cli_classic_commit() nb_candidate_commit_prepare() [fail] -> copy running -> candidate nb_candidate_commit_apply() -> copy candidate -> running fixes #18541 Signed-off-by: Christian Hopps <chopps@labn.net>
1 parent 994fdee commit b12b4c2

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

mgmtd/mgmt_fe_adapter.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,6 @@ static void mgmt_fe_session_unlock_ds(Mgmtd__DatastoreId ds_id,
216216
static void
217217
mgmt_fe_session_cfg_txn_cleanup(struct mgmt_fe_session_ctx *session)
218218
{
219-
/*
220-
* Ensure any uncommitted changes in Candidate DS
221-
* is discarded.
222-
*/
223-
mgmt_ds_copy_dss(mm->running_ds, mm->candidate_ds, false);
224-
225219
/*
226220
* Destroy the actual transaction created earlier.
227221
*/

0 commit comments

Comments
 (0)