[202412] zebra: defer RIB sweep until metaqueue is drained

[deepak-singhal0408]

What I did

Cherry-pick of sonic-net/sonic-buildimage#27093 to msft-202412 branch.

How I did it

Same FRR patch (defer RIB sweep until metaqueue drains). Renumbered from 0108 to 0147 to match msft-202412 patch series.

How to verify it

CI build passes (FRR patch applies cleanly).

Which release branch to backport

N/A — this IS the backport.

Description for the changelog

zebra: defer RIB sweep until metaqueue is drained — prevents premature route deletion during FRR startup.

[deepak-singhal0408]

@r12f can you help merging this PR? thanks,

[r12f]

Hi @deepak-singhal0408 , may I know the impact of this change? It looks very scary for a change at the end of the release time. We are moving away from 202412. If this is not an absolute must, we will skip it.

[r12f]

@BYGX-wcr is this the fix for the ghost default route issue?

[deepak-singhal0408]

@r12f , yes, this fix is for the ghost default route issue. The fix is very pointed and just does stale entries cleanup upon restart(earlier code was missing this cleanup). This fix has been discussed in frr upstream (being fixed via a general enhancement PR), included in buildimage master and 202511.

Created the cherry-pick thinking this might be needed in msft-202412 too.. But leaving on you to decide. Thanks,

[r12f]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[r12f]

hi @deepak-singhal0408 , looks like the patch all not apply. do you mind to help fix this?

<stdin>:171: trailing whitespace.
   r1# show bgp nexthop detail 
warning: 1 line adds whitespace errors.
<stdin>:292: trailing whitespace.
	
<stdin>:1087: trailing whitespace.
	
<stdin>:1797: trailing whitespace.
		
warning: 3 lines add whitespace errors.
<stdin>:17: trailing whitespace.
	 * singleton nhe so set this nexthops flag as appropriate. 
warning: 1 line adds whitespace errors.
<stdin>:42: trailing whitespace.
/* 32 hex chars 
<stdin>:44: trailing whitespace.
 * hex string is 20010db885a3000000008a2e03707334, 
<stdin>:111: trailing whitespace.
		 * expiry time is 10 ms and, AdvIntervalTimer == 1005 ms. Allowing 
<stdin>:113: trailing whitespace.
		 * we have waited Wait atleast AdvIntervalTimer, so RA can be 
<stdin>:136: trailing whitespace.
		/*Failed to join on 1st attempt, wait random amount of time between 1 ms 
warning: 5 lines add whitespace errors.
<stdin>:404: trailing whitespace.
						/* The "inner" resume info will be set; 
warning: 1 line adds whitespace errors.
<stdin>:194: space before tab in indent.
 	}
warning: 1 line adds whitespace errors.
<stdin>:72: space before tab in indent.
 	if (wheel->run_forever)
<stdin>:74: trailing whitespace.
	
<stdin>:128: trailing whitespace.
 
<stdin>:132: trailing whitespace.
 
<stdin>:135: space before tab in indent.
 	struct listnode *node, *nextnode;
warning: squelched 28 whitespace errors
warning: 33 lines add whitespace errors.
error: patch failed: zebra/zebra_rib.c:5027
error: zebra/zebra_rib.c: patch does not apply
stg import: Diff does not apply cleanly

[deepak-singhal0408]

/azpw run

[deepak-singhal0408]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[deepak-singhal0408]

hi @deepak-singhal0408 , looks like the patch all not apply. do you mind to help fix this?

<stdin>:171: trailing whitespace.
   r1# show bgp nexthop detail 
warning: 1 line adds whitespace errors.
<stdin>:292: trailing whitespace.
	
<stdin>:1087: trailing whitespace.
	
<stdin>:1797: trailing whitespace.
		
warning: 3 lines add whitespace errors.
<stdin>:17: trailing whitespace.
	 * singleton nhe so set this nexthops flag as appropriate. 
warning: 1 line adds whitespace errors.
<stdin>:42: trailing whitespace.
/* 32 hex chars 
<stdin>:44: trailing whitespace.
 * hex string is 20010db885a3000000008a2e03707334, 
<stdin>:111: trailing whitespace.
		 * expiry time is 10 ms and, AdvIntervalTimer == 1005 ms. Allowing 
<stdin>:113: trailing whitespace.
		 * we have waited Wait atleast AdvIntervalTimer, so RA can be 
<stdin>:136: trailing whitespace.
		/*Failed to join on 1st attempt, wait random amount of time between 1 ms 
warning: 5 lines add whitespace errors.
<stdin>:404: trailing whitespace.
						/* The "inner" resume info will be set; 
warning: 1 line adds whitespace errors.
<stdin>:194: space before tab in indent.
 	}
warning: 1 line adds whitespace errors.
<stdin>:72: space before tab in indent.
 	if (wheel->run_forever)
<stdin>:74: trailing whitespace.
	
<stdin>:128: trailing whitespace.
 
<stdin>:132: trailing whitespace.
 
<stdin>:135: space before tab in indent.
 	struct listnode *node, *nextnode;
warning: squelched 28 whitespace errors
warning: 33 lines add whitespace errors.
error: patch failed: zebra/zebra_rib.c:5027
error: zebra/zebra_rib.c: patch does not apply
stg import: Diff does not apply cleanly

fixed @r12f . thanks,