bgpd: fix config display of coalesce-time

Since coalesce time is now heuristically adjusted based on peer count,
we need to separate out specific configuration by the user from the
current value. Behavior established is to not adjust if the user has a
value set.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 5515643ed1ae185fca4696c66df79ffe8937b35f..1c6d38dccf0f1bec81bb5fd0e982b74ad3ef543c 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1423,8 +1423,8 @@ DEFUN (no_bgp_rpkt_quanta,
 
 void bgp_config_write_coalesce_time(struct vty *vty, struct bgp *bgp)
 {
-       if (bgp->coalesce_time != BGP_DEFAULT_SUBGROUP_COALESCE_TIME)
-               vty_out(vty, " coalesce-time %u\n", bgp->coalesce_time);
+       if (bgp->v_coalesce_time)
+               vty_out(vty, " coalesce-time %u\n", bgp->v_coalesce_time);
 }
 
 
@@ -1438,7 +1438,8 @@ DEFUN (bgp_coalesce_time,
 
        int idx = 0;
        argv_find(argv, argc, "(0-4294967295)", &idx);
-       bgp->coalesce_time = strtoul(argv[idx]->arg, NULL, 10);
+       bgp->coalesce_time = bgp->v_coalesce_time =
+               strtoul(argv[idx]->arg, NULL, 10);
        return CMD_SUCCESS;
 }
 
@@ -1451,6 +1452,7 @@ DEFUN (no_bgp_coalesce_time,
 {
        VTY_DECLVAR_CONTEXT(bgp, bgp);
 
+       bgp->v_coalesce_time = 0;
        bgp->coalesce_time = BGP_DEFAULT_SUBGROUP_COALESCE_TIME;
        return CMD_SUCCESS;
 }

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 8b27a0e905fd4f8d3a9a8695fb65937f2e3488f4..ed92246dbc7bf1b88d32a072d9b1a83e38d8a406 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1475,9 +1475,12 @@ struct peer *peer_create(union sockunion *su, const char *conf_if,
        hash_get(bgp->peerhash, peer, hash_alloc_intern);
 
        /* Adjust update-group coalesce timer heuristics for # peers. */
-       long ct = BGP_DEFAULT_SUBGROUP_COALESCE_TIME
-                 + (bgp->peer->count * BGP_PEER_ADJUST_SUBGROUP_COALESCE_TIME);
-       bgp->coalesce_time = MIN(BGP_MAX_SUBGROUP_COALESCE_TIME, ct);
+       if (!bgp->v_coalesce_time) {
+               long ct = BGP_DEFAULT_SUBGROUP_COALESCE_TIME
+                         + (bgp->peer->count
+                            * BGP_PEER_ADJUST_SUBGROUP_COALESCE_TIME);
+               bgp->coalesce_time = MIN(BGP_MAX_SUBGROUP_COALESCE_TIME, ct);
+       }
 
        active = peer_active(peer);
 

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index e5e363ef52252552b7b6aa15be32ed35ef780576..e8189dbf8c1c93910625c5c01d5cfd1892cc0d44 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -381,7 +381,10 @@ struct bgp {
        _Atomic uint32_t wpkt_quanta; // max # packets to write per i/o cycle
        _Atomic uint32_t rpkt_quanta; // max # packets to read per i/o cycle
 
-       u_int32_t coalesce_time;
+       /* Configured coalesce time */
+       uint32_t v_coalesce_time;
+       /* Actual coalesce time */
+       uint32_t coalesce_time;
 
        u_int32_t addpath_tx_id;
        int addpath_tx_used[AFI_MAX][SAFI_MAX];