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

Merge pull request #5043 from donaldsharp/update_groups_and_coalesce_timer

Browse Source 
Update groups and coalesce timer
This commit is contained in:
Donatas Abraitis 2019-09-24 10:07:40 +03:00 committed by GitHub
commit ac4088a5e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_updgrp.c
View File

@ -570,8 +570,7 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg)
vty_out(vty, " Created: %s", timestamp_string(updgrp->uptime)); vty_out(vty, " Created: %s", timestamp_string(updgrp->uptime));
filter = &updgrp->conf->filter[updgrp->afi][updgrp->safi]; filter = &updgrp->conf->filter[updgrp->afi][updgrp->safi];
if (filter->map[RMAP_OUT].name) if (filter->map[RMAP_OUT].name)
vty_out(vty, " Outgoing route map: %s%s\n", vty_out(vty, " Outgoing route map: %s\n",
filter->map[RMAP_OUT].map ? "X" : "",
filter->map[RMAP_OUT].name); filter->map[RMAP_OUT].name);
vty_out(vty, " MRAI value (seconds): %d\n", updgrp->conf->v_routeadv); vty_out(vty, " MRAI value (seconds): %d\n", updgrp->conf->v_routeadv);
if (updgrp->conf->change_local_as) if (updgrp->conf->change_local_as)
@ -613,6 +612,9 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg)
subgrp->peer_refreshes_combined); subgrp->peer_refreshes_combined);
vty_out(vty, " Merge checks triggered: %u\n", vty_out(vty, " Merge checks triggered: %u\n",
subgrp->merge_checks_triggered); subgrp->merge_checks_triggered);
vty_out(vty, " Coalesce Time: %u%s\n",
(UPDGRP_INST(subgrp->update_group))->coalesce_time,
subgrp->t_coalesce ? "(Running)" : "");
vty_out(vty, " Version: %" PRIu64 "\n", subgrp->version); vty_out(vty, " Version: %" PRIu64 "\n", subgrp->version);
vty_out(vty, " Packet queue length: %d\n", vty_out(vty, " Packet queue length: %d\n",
bpacket_queue_length(SUBGRP_PKTQ(subgrp))); bpacket_queue_length(SUBGRP_PKTQ(subgrp)));

5
bgpd/bgp_updgrp_adv.c
View File

@ -324,8 +324,9 @@ static int subgroup_coalesce_timer(struct thread *thread)
subgrp = THREAD_ARG(thread); subgrp = THREAD_ARG(thread);
if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0)) if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0))
zlog_debug("u%" PRIu64 ":s%" PRIu64 zlog_debug("u%" PRIu64 ":s%" PRIu64
" announcing routes upon coalesce timer expiry", " announcing routes upon coalesce timer expiry(%u ms)",
(SUBGRP_UPDGRP(subgrp))->id, subgrp->id); (SUBGRP_UPDGRP(subgrp))->id, subgrp->id,
subgrp->v_coalesce),
subgrp->t_coalesce = NULL; subgrp->t_coalesce = NULL;
subgrp->v_coalesce = 0; subgrp->v_coalesce = 0;
subgroup_announce_route(subgrp); subgroup_announce_route(subgrp);

17
doc/user/bgp.rst
View File

@ -2396,6 +2396,23 @@ Displaying Routes by AS Path
Print a summary of neighbor connections for the specified AFI/SAFI combination. Print a summary of neighbor connections for the specified AFI/SAFI combination.
Displaying Update Group Information
-----------------------------------
..index:: show bgp update-groups SUBGROUP-ID [advertise-queue|advertised-routes|packet-queue]
..clicmd:: show bgp update-groups [advertise-queue|advertised-routes|packet-queue]
Display Information about each individual update-group being used.
If SUBGROUP-ID is specified only display about that particular group. If
advertise-queue is specified the list of routes that need to be sent
to the peers in the update-group is displayed, advertised-routes means
the list of routes we have sent to the peers in the update-group and
packet-queue specifies the list of packets in the queue to be sent.
..index:: show bgp update-groups statistics
..clicmd:: show bgp update-groups statistics
Display Information about update-group events in FRR.
.. _bgp-route-reflector: .. _bgp-route-reflector: