Merge pull request #17969 from donaldsharp/fpm_lost_sends

zebra: Ensure dplane does not send work back to master at wrong time
This commit is contained in:
Mark Stapp 2025-02-04 11:18:07 -05:00 committed by GitHub
commit 704372bf4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -7528,6 +7528,16 @@ static void dplane_thread_loop(struct event *event)
if (!zdplane_info.dg_run)
break;
/*
* The yield should only happen after a bit of work has been
* done but before we pull any new work off any provider
* queue to continue looping. This is a safe spot to
* do so.
*/
if (event_should_yield(event)) {
reschedule = true;
break;
}
/* Locate next provider */
next_prov = dplane_prov_list_next(&zdplane_info.dg_providers,
prov);
@ -7592,11 +7602,6 @@ static void dplane_thread_loop(struct event *event)
zlog_debug("dplane dequeues %d completed work from provider %s",
counter, dplane_provider_get_name(prov));
if (event_should_yield(event)) {
reschedule = true;
break;
}
/* Locate next provider */
prov = next_prov;
}