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

Merge pull request #3733 from donaldsharp/meta_queue_nht_game_over_man_game_over

Browse Source 
zebra: NHT was being run at least 2 times and missreporting data
This commit is contained in:
Russ White 2019-02-05 11:06:42 -05:00 committed by GitHub
commit 5dd91bc84f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zebra/zebra_rib.c
View File

@ -2152,14 +2152,6 @@ static void do_nht_processing(void)
} }
} }
/*
* All meta queues have been processed. Trigger next-hop evaluation.
*/
static void meta_queue_process_complete(struct work_queue *dummy)
{
do_nht_processing();
}
/* Dispatch the meta queue by picking, processing and unlocking the next RN from /* Dispatch the meta queue by picking, processing and unlocking the next RN from
* a non-empty sub-queue with lowest priority. wq is equal to zebra->ribq and * a non-empty sub-queue with lowest priority. wq is equal to zebra->ribq and
* data * data
@ -2333,7 +2325,7 @@ static void rib_queue_init(void)
/* fill in the work queue spec */ /* fill in the work queue spec */
zrouter.ribq->spec.workfunc = &meta_queue_process; zrouter.ribq->spec.workfunc = &meta_queue_process;
zrouter.ribq->spec.errorfunc = NULL; zrouter.ribq->spec.errorfunc = NULL;
zrouter.ribq->spec.completion_func = &meta_queue_process_complete; zrouter.ribq->spec.completion_func = NULL;
/* XXX: TODO: These should be runtime configurable via vty */ /* XXX: TODO: These should be runtime configurable via vty */
zrouter.ribq->spec.max_retries = 3; zrouter.ribq->spec.max_retries = 3;
zrouter.ribq->spec.hold = ZEBRA_RIB_PROCESS_HOLD_TIME; zrouter.ribq->spec.hold = ZEBRA_RIB_PROCESS_HOLD_TIME;