proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 12:21:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mgmtd: remove unused commit phase SEND_CFG

Browse Source 
Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2024-02-08 10:30:42 -05:00 committed by Christian Hopps
parent d71710a910
commit 40e51d2257
3 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mgmtd/mgmt_fe_adapter.c
View File

@ -1586,15 +1586,6 @@ mgmt_fe_adapter_cmt_stats_write(struct vty *vty,
mgmt_realtime_to_string( mgmt_realtime_to_string(
&adapter->cmt_stats.txn_create_start, &adapter->cmt_stats.txn_create_start,
buf, sizeof(buf))); buf, sizeof(buf)));
vty_out(vty,
#ifdef MGMTD_LOCAL_VALIDATIONS_ENABLED
" Send-Config Start: \t\t%s\n",
#else
" Send-Config-Validate Start: \t%s\n",
#endif
mgmt_realtime_to_string(
&adapter->cmt_stats.send_cfg_start, buf,
sizeof(buf)));
vty_out(vty, " Apply-Config Start: \t\t%s\n", vty_out(vty, " Apply-Config Start: \t\t%s\n",
mgmt_realtime_to_string( mgmt_realtime_to_string(
&adapter->cmt_stats.apply_cfg_start, &adapter->cmt_stats.apply_cfg_start,

1
mgmtd/mgmt_fe_adapter.h
View File

@ -24,7 +24,6 @@ struct mgmt_commit_stats {
#endif #endif
struct timeval prep_cfg_start; struct timeval prep_cfg_start;
struct timeval txn_create_start; struct timeval txn_create_start;
struct timeval send_cfg_start;
struct timeval apply_cfg_start; struct timeval apply_cfg_start;
struct timeval apply_cfg_end; struct timeval apply_cfg_end;
struct timeval txn_del_start; struct timeval txn_del_start;

28
mgmtd/mgmt_txn.c
View File

@ -49,7 +49,6 @@ struct mgmt_set_cfg_req {
enum mgmt_commit_phase { enum mgmt_commit_phase {
MGMTD_COMMIT_PHASE_PREPARE_CFG = 0, MGMTD_COMMIT_PHASE_PREPARE_CFG = 0,
MGMTD_COMMIT_PHASE_TXN_CREATE, MGMTD_COMMIT_PHASE_TXN_CREATE,
MGMTD_COMMIT_PHASE_SEND_CFG,
MGMTD_COMMIT_PHASE_APPLY_CFG, MGMTD_COMMIT_PHASE_APPLY_CFG,
MGMTD_COMMIT_PHASE_TXN_DELETE, MGMTD_COMMIT_PHASE_TXN_DELETE,
MGMTD_COMMIT_PHASE_MAX MGMTD_COMMIT_PHASE_MAX
@ -62,8 +61,6 @@ static inline const char *mgmt_commit_phase2str(enum mgmt_commit_phase cmt_phase
return "PREP-CFG"; return "PREP-CFG";
case MGMTD_COMMIT_PHASE_TXN_CREATE: case MGMTD_COMMIT_PHASE_TXN_CREATE:
return "CREATE-TXN"; return "CREATE-TXN";
case MGMTD_COMMIT_PHASE_SEND_CFG:
return "SEND-CFG";
case MGMTD_COMMIT_PHASE_APPLY_CFG: case MGMTD_COMMIT_PHASE_APPLY_CFG:
return "APPLY-CFG"; return "APPLY-CFG";
case MGMTD_COMMIT_PHASE_TXN_DELETE: case MGMTD_COMMIT_PHASE_TXN_DELETE:
@ -1187,13 +1184,10 @@ static int mgmt_txn_send_be_cfg_data(struct mgmt_txn_ctx *txn,
cmtcfg_req->cmt_stats->last_num_cfgdata_reqs++; cmtcfg_req->cmt_stats->last_num_cfgdata_reqs++;
} }
cmtcfg_req->be_phase[adapter->id] = MGMTD_COMMIT_PHASE_SEND_CFG;
/* /*
* This could be the last Backend Client to send CFGDATA_CREATE_REQ to. * We don't advance the phase here, instead that is driven by the
* Try moving the commit to next phase. * cfg_reply.
*/ */
mgmt_try_move_commit_to_next_phase(txn, cmtcfg_req);
return 0; return 0;
} }
@ -1394,24 +1388,6 @@ static void mgmt_txn_process_commit_cfg(struct event *thread)
*/ */
mgmt_txn_send_be_txn_create(txn); mgmt_txn_send_be_txn_create(txn);
break; break;
case MGMTD_COMMIT_PHASE_SEND_CFG:
if (mm->perf_stats_en)
gettimeofday(&cmtcfg_req->cmt_stats->send_cfg_start,
NULL);
/*
* All CFGDATA_CREATE_REQ should have been sent to
* Backend by now.
*/
#ifndef MGMTD_LOCAL_VALIDATIONS_ENABLED
__dbg("txn-id: %" PRIu64 " session-id: %" PRIu64
" trigger sending CFG_VALIDATE_REQ to all backend clients",
txn->txn_id, txn->session_id);
#else /* ifndef MGMTD_LOCAL_VALIDATIONS_ENABLED */
__dbg("txn-id: %" PRIu64 " session-id: %" PRIu64
" trigger sending CFG_APPLY_REQ to all backend clients",
txn->txn_id, txn->session_id);
#endif /* ifndef MGMTD_LOCAL_VALIDATIONS_ENABLED */
break;
case MGMTD_COMMIT_PHASE_APPLY_CFG: case MGMTD_COMMIT_PHASE_APPLY_CFG:
if (mm->perf_stats_en) if (mm->perf_stats_en)
gettimeofday(&cmtcfg_req->cmt_stats->apply_cfg_start, gettimeofday(&cmtcfg_req->cmt_stats->apply_cfg_start,