zebra: Ensure dplane does not send work back to master at wrong time

When looping through the dplane providers, the worklist was
being populated with items from the last provider and then
the event system was checked to see if we should stop processing.
If the event system says `yes` then the dplane code would stop
and send the worklist to the master zebra pthread for collection.
This obviously skipped the next dplane provider on the list
which is double plus not good.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit c41155221e7fb7890fecc37f1685063dce6caaca)

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 00e990e856fdf3a13cc8b4d508d109c4e6c48395..910e52160b67a6966f632e806884a05ebabe0995 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -7472,6 +7472,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);
@@ -7536,11 +7546,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;
        }