Merge pull request #1538 from eclipse-zenoh/fix/backoff

Fix backoff priority
eclipse-zenoh · Oct 16, 2024 · 363e817 · 363e817
2 parents 1d21418 + d0b72bb
commit 363e817
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/io/zenoh-transport/src/common/pipeline.rs b/io/zenoh-transport/src/common/pipeline.rs
@@ -460,6 +460,7 @@ impl StageOutIn {
     #[inline]
     fn try_pull(&mut self) -> Pull {
         if let Some(batch) = self.s_out_r.pull() {
+            self.backoff.atomic.active.store(false, Ordering::Relaxed);
             return Pull::Some(batch);
         }
 
@@ -746,9 +747,8 @@ impl TransmissionPipelineConsumer {
                         return Some((batch, prio));
                     }
                     Pull::Backoff(deadline) => {
-                        if deadline < backoff {
-                            backoff = deadline;
-                        }
+                        backoff = deadline;
+                        break;
                     }
                     Pull::None => {}
                 }