proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 00:31:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9190 from donaldsharp/join_prune_smaller

Browse Source 
Join prune smaller
This commit is contained in:
Donatas Abraitis 2021-07-27 15:26:52 +03:00 committed by GitHub
commit 5eefffd64e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/user/pim.rst
View File

@ -93,11 +93,13 @@ Certain signals have special meanings to *pimd*.
down. This command is vrf aware, to configure for a vrf, enter the vrf
submode.
.. clicmd:: ip pim join-prune-interval (60-600)
.. clicmd:: ip pim join-prune-interval (5-600)
Modify the join/prune interval that pim uses to the new value. Time is
specified in seconds. This command is vrf aware, to configure for a vrf,
enter the vrf submode.
enter the vrf submode. The default time is 60 seconds. If you enter
a value smaller than 60 seconds be aware that this can and will affect
convergence at scale.
.. clicmd:: ip pim keep-alive-timer (31-60000)

4
pimd/pim_cmd.c
View File

@ -7187,7 +7187,7 @@ DEFPY (pim_register_accept_list,
DEFUN (ip_pim_joinprune_time,
ip_pim_joinprune_time_cmd,
"ip pim join-prune-interval (60-600)",
"ip pim join-prune-interval (5-600)",
IP_STR
"pim multicast routing\n"
"Join Prune Send Interval\n"
@ -7201,7 +7201,7 @@ DEFUN (ip_pim_joinprune_time,
DEFUN (no_ip_pim_joinprune_time,
no_ip_pim_joinprune_time_cmd,
"no ip pim join-prune-interval (60-600)",
"no ip pim join-prune-interval (5-600)",
NO_STR
IP_STR
"pim multicast routing\n"

1
tests/topotests/evpn_pim_1/leaf1/pimd.conf
View File

@ -2,6 +2,7 @@ debug pim events
debug pim nht
debug pim zebra
ip pim rp 192.168.100.1
ip pim join-prune-interval 5
!
int lo
ip pim

1
tests/topotests/evpn_pim_1/leaf2/pimd.conf
View File

@ -1,4 +1,5 @@
ip pim rp 192.168.100.1
ip pim join-prune-interval 5
!
int lo
ip pim

1
tests/topotests/evpn_pim_1/spine/pimd.conf
View File

@ -1,4 +1,5 @@
ip pim rp 192.168.100.1
ip pim join-prune-interval 5
!
int lo
ip pim

1
tests/topotests/msdp_mesh_topo1/r1/pimd.conf
View File

@ -10,6 +10,7 @@ interface r1-eth1
ip igmp
!
ip pim rp 10.254.254.1
ip pim join-prune-interval 5
ip msdp timers 10 20 3
ip msdp mesh-group mg-1 source 10.254.254.1
ip msdp mesh-group mg-1 member 10.254.254.2

1
tests/topotests/msdp_mesh_topo1/r2/pimd.conf
View File

@ -9,6 +9,7 @@ interface r2-eth1
ip pim
!
ip pim rp 10.254.254.2
ip pim join-prune-interval 5
ip msdp timers 10 20 3
ip msdp mesh-group mg-1 source 10.254.254.2
ip msdp mesh-group mg-1 member 10.254.254.1

1
tests/topotests/msdp_mesh_topo1/r3/pimd.conf
View File

@ -9,6 +9,7 @@ interface r3-eth1
ip pim
ip igmp
!
ip pim join-prune-interval 5
ip pim rp 10.254.254.3
ip msdp timers 10 20 3
ip msdp mesh-group mg-1 source 10.254.254.3

1
tests/topotests/msdp_topo1/r1/pimd.conf
View File

@ -19,3 +19,4 @@ ip msdp timers 10 20 3
ip msdp peer 192.168.0.2 source 192.168.0.1
ip msdp peer 192.168.1.2 source 192.168.1.1
ip pim rp 10.254.254.1
ip pim join-prune-interval 5

1
tests/topotests/msdp_topo1/r2/pimd.conf
View File

@ -15,3 +15,4 @@ ip msdp timers 10 20 3
ip msdp peer 192.168.0.1 source 192.168.0.2
ip msdp peer 192.168.2.2 source 192.168.2.1
ip pim rp 10.254.254.2
ip pim join-prune-interval 5

1
tests/topotests/msdp_topo1/r3/pimd.conf
View File

@ -15,3 +15,4 @@ ip msdp timers 10 20 3
ip msdp peer 192.168.1.1 source 192.168.1.2
ip msdp peer 192.168.3.2 source 192.168.3.1
ip pim rp 10.254.254.3
ip pim join-prune-interval 5

1
tests/topotests/msdp_topo1/r4/pimd.conf
View File

@ -19,3 +19,4 @@ ip msdp timers 10 20 3
ip msdp peer 192.168.2.1 source 192.168.2.2
ip msdp peer 192.168.3.1 source 192.168.3.2
ip pim rp 10.254.254.4
ip pim join-prune-interval 5

1
tests/topotests/pim_acl/r1/pimd.conf
View File

@ -13,6 +13,7 @@ ip pim rp 192.168.0.12 prefix-list rp-pl-2
ip pim rp 192.168.0.13 prefix-list rp-pl-3
ip pim rp 192.168.0.14 prefix-list rp-pl-4
ip pim rp 192.168.0.15 prefix-list rp-pl-5
ip pim join-prune-interval 5
!
interface r1-eth0
ip igmp

1
tests/topotests/pim_acl/r11/pimd.conf
View File

@ -7,6 +7,7 @@ debug pim zebra
debug pim bsm
!
ip pim rp 192.168.0.11 239.100.0.0/28
ip pim join-prune-interval 5
!
interface lo
ip pim

1
tests/topotests/pim_acl/r12/pimd.conf
View File

@ -7,6 +7,7 @@ debug pim zebra
debug pim bsm
!
ip pim rp 192.168.0.12 239.100.0.17/32
ip pim join-prune-interval 5
!
interface lo
ip pim

1
tests/topotests/pim_acl/r13/pimd.conf
View File

@ -7,6 +7,7 @@ debug pim zebra
debug pim bsm
!
ip pim rp 192.168.0.13 239.100.0.32/27
ip pim join-prune-interval 5
!
interface lo
ip pim

1
tests/topotests/pim_acl/r14/pimd.conf
View File

@ -8,6 +8,7 @@ debug pim bsm
!
ip pim rp 192.168.0.14 239.100.0.96/28
ip pim rp 192.168.0.14 239.100.0.128/25
ip pim join-prune-interval 5
!
interface lo
ip pim

1
tests/topotests/pim_acl/r15/pimd.conf
View File

@ -7,6 +7,7 @@ debug pim zebra
debug pim bsm
!
ip pim rp 192.168.0.15 239.100.0.64/28
ip pim join-prune-interval 5
!
interface lo
ip pim

1
tests/topotests/pim_basic/r1/pimd.conf
View File

@ -15,3 +15,4 @@ interface lo
ip pim
!
ip pim rp 10.254.0.3
ip pim join-prune-interval 5

1
tests/topotests/pim_basic/rp/pimd.conf
View File

@ -6,6 +6,7 @@ interface rp-eth0
interface lo
ip pim
!
ip pim join-prune-interval 5
ip pim rp 10.254.0.3
ip pim register-accept-list ACCEPT

1
tests/topotests/pim_basic_topo2/r2/pimd.conf
View File

@ -10,3 +10,4 @@ interface r2-eth2
ip pim
ip pim bfd
!
ip pim join-prune-interval 5

1
tests/topotests/pim_igmp_vrf/r1/pimd.conf
View File

@ -24,3 +24,4 @@ interface r1-eth2
interface r1-eth3
ip pim
!
ip pim join-prune-interval 5

1
tests/topotests/pim_igmp_vrf/r11/pimd.conf
View File

@ -7,6 +7,7 @@ debug pim zebra
debug pim bsm
!
ip pim rp 192.168.0.11 239.100.0.0/28
ip pim join-prune-interval 5
!
interface lo
ip pim

1
tests/topotests/pim_igmp_vrf/r12/pimd.conf
View File

@ -7,6 +7,7 @@ debug pim zebra
debug pim bsm
!
ip pim rp 192.168.0.12 239.100.0.0/28
ip pim join-prune-interval 5
!
interface lo
ip pim

2
yang/frr-pim.yang
View File

@ -529,7 +529,7 @@ module frr-pim {
}
leaf join-prune-interval {
type uint16 {
range "60..600";
range "5..600";
}
default "60";
description