matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #18503 from gromit1811/bugfix/ospf6_gr_leak

Browse source 
ospf6d: Fix LSA memory leaks related to graceful restart
This commit is contained in:
Donald Sharp 2025-03-26 10:30:30 -04:00 committed by GitHub
parent 38fd34f363 b73e3ae69d
commit 8ca4376e01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ospf6d/ospf6_flood.c
View file

@ -1061,6 +1061,7 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from,
zlog_debug( zlog_debug(
"%s, Not moving to HELPER role, So dicarding GraceLSA", "%s, Not moving to HELPER role, So dicarding GraceLSA",
__func__); __func__);
ospf6_lsa_delete(new);
return; return;
} }
} }

1
ospf6d/ospf6_gr.c
View file

@ -371,6 +371,7 @@ void ospf6_gr_check_lsdb_consistency(struct ospf6 *ospf6,
snprintfrr(reason, sizeof(reason), snprintfrr(reason, sizeof(reason),
"detected inconsistent LSA %s [area %pI4]", "detected inconsistent LSA %s [area %pI4]",
lsa->name, &area->area_id); lsa->name, &area->area_id);
ospf6_lsa_unlock(&lsa);
ospf6_gr_restart_exit(ospf6, reason); ospf6_gr_restart_exit(ospf6, reason);
return; return;
} }

22
tests/topotests/ospf6_gr_topo1/test_ospf6_gr_topo1.py
View file

@ -17,14 +17,14 @@ test_ospf6_gr_topo1.py:
| 1.1.1.1 | | 1.1.1.1 |
+---------+ +---------+
|eth-rt2 |eth-rt2
| |area 1
|eth-rt1 |eth-rt1
+---------+ +---------+
| RT2 | | RT2 |
| 2.2.2.2 | | 2.2.2.2 |
+---------+ +---------+
|eth-rt3 |eth-rt3
| |area 0
|eth-rt2 |eth-rt2
+---------+ +---------+
| RT3 | | RT3 |
@ -33,14 +33,14 @@ test_ospf6_gr_topo1.py:
eth-rt4| |eth-rt6 eth-rt4| |eth-rt6
| | | |
+---------+ +--------+ +---------+ +--------+
| | |area 0 |area 0
|eth-rt3 |eth-rt3 |eth-rt3 |eth-rt3
+---------+ +---------+ +---------+ +---------+
| RT4 | | RT6 | | RT4 | | RT6 |
| 4.4.4.4 | | 6.6.6.6 | | 4.4.4.4 | | 6.6.6.6 |
+---------+ +---------+ +---------+ +---------+
|eth-rt5 |eth-rt7 |eth-rt5 |eth-rt7
| | |area 2 |area 3
|eth-rt4 |eth-rt6 |eth-rt4 |eth-rt6
+---------+ +---------+ +---------+ +---------+
| RT5 | | RT7 | | RT5 | | RT7 |
@ -153,7 +153,7 @@ def router_compare_json_output(rname, command, reference, tries):
expected = json.loads(open(filename).read()) expected = json.loads(open(filename).read())
test_func = partial(topotest.router_json_cmp, tgen.gears[rname], command, expected) test_func = partial(topotest.router_json_cmp, tgen.gears[rname], command, expected)
_, diff = topotest.run_and_expect(test_func, None, count=tries, wait=0.5) _, diff = topotest.run_and_expect(test_func, None, count=tries, wait=1)
assertmsg = '"{}" JSON output mismatches the expected result'.format(rname) assertmsg = '"{}" JSON output mismatches the expected result'.format(rname)
assert diff is None, assertmsg assert diff is None, assertmsg
@ -206,12 +206,12 @@ def check_routers(initial_convergence=False, exiting=None, restarting=None):
# processing it. Let's give it a few seconds to allow this to happen # processing it. Let's give it a few seconds to allow this to happen
# under load. # under load.
if initial_convergence == True: if initial_convergence == True:
tries = 240 tries = 120
else: else:
if restarting != None: if restarting != None:
tries = 40 tries = 20
else: else:
tries = 10 tries = 15
router_compare_json_output( router_compare_json_output(
rname, "show ipv6 route ospf json", "show_ipv6_route.json", tries rname, "show ipv6 route ospf json", "show_ipv6_route.json", tries
) )
@ -219,7 +219,7 @@ def check_routers(initial_convergence=False, exiting=None, restarting=None):
# Check that all adjacencies are up and running (except when there's # Check that all adjacencies are up and running (except when there's
# an OSPF instance that is shutting down). # an OSPF instance that is shutting down).
if exiting == None: if exiting == None:
tries = 240 tries = 120
router_compare_json_output( router_compare_json_output(
rname, rname,
"show ipv6 ospf neighbor json", "show ipv6 ospf neighbor json",
@ -231,9 +231,9 @@ def check_routers(initial_convergence=False, exiting=None, restarting=None):
# In the restarting router, wait up to one minute for the LSDB to converge. # In the restarting router, wait up to one minute for the LSDB to converge.
if exiting != rname: if exiting != rname:
if initial_convergence == True or restarting == rname: if initial_convergence == True or restarting == rname:
tries = 240 tries = 120
else: else:
tries = 10 tries = 15
router_compare_json_output( router_compare_json_output(
rname, rname,
"show ipv6 ospf database json", "show ipv6 ospf database json",