diff options
| author | Chirag Shah <chirag@cumulusnetworks.com> | 2017-04-27 20:01:32 +0200 |
|---|---|---|
| committer | Chirag Shah <chirag@cumulusnetworks.com> | 2017-05-07 02:38:18 +0200 |
| commit | 815c33c92f10c112dba83f4ed46a6eaaa55edbb4 (patch) | |
| tree | 8ae71bb5959d41ca12a445e0b01477699e8fb221 /pimd/pim_igmpv3.c | |
| parent | Merge pull request #462 from donaldsharp/poll_3.0 (diff) | |
| download | frr-815c33c92f10c112dba83f4ed46a6eaaa55edbb4.tar.xz frr-815c33c92f10c112dba83f4ed46a6eaaa55edbb4.zip | |
pimd: fix channel_oil and upstream RPF in sync
During PIM Neighbor change/UP event, pim_scan_oil api
scans all channel oil to see any rpf impacted. Instead of
passing current upstream's RPF it passes current RPF as 0 and
does query to rib for nexhtop (without ECMP/Rebalance). This creates
inconsist RPF between Upstream and Channel oil.
In Channel Oil keep backward pointer to upstream DB and fetch up's
RPF and passed to channel_oil scan.
Decrement channel_oil ref_count in upstream_del when decrementing
up ref_count and it is not the last.
Created ECMP based FIB lookup API.
Testing Done:
Performed following testing on tester setup:
5 x LHR, 4 x MSDP Spines, 6 Sources each sending to 1023 groups from one of the spines.
Total send rate 8Mpps.
Test that caused problems was to reboot every device at the same time.
After fix performed 5 iterations of reboot devices and show no sign of the problem.
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_igmpv3.c')
| -rw-r--r-- | pimd/pim_igmpv3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c index 8c7083d83..86509a20c 100644 --- a/pimd/pim_igmpv3.c +++ b/pimd/pim_igmpv3.c @@ -357,10 +357,11 @@ void igmp_source_delete(struct igmp_source *source) char source_str[INET_ADDRSTRLEN]; pim_inet4_dump("<group?>", group->group_addr, group_str, sizeof(group_str)); pim_inet4_dump("<source?>", source->source_addr, source_str, sizeof(source_str)); - zlog_debug("Deleting IGMP source %s for group %s from socket %d interface %s", + zlog_debug("Deleting IGMP source %s for group %s from socket %d interface %s c_oil ref_count %d", source_str, group_str, group->group_igmp_sock->fd, - group->group_igmp_sock->interface->name); + group->group_igmp_sock->interface->name, + source->source_channel_oil ? source->source_channel_oil->oil_ref_count : 0); } source_timer_off(group, source); |