fix: select channel for clear barrier worker with higher priority (#1…

…9700)
risingwavelabs · Dec 6, 2024 · 0c27a8b · 0c27a8b
1 parent 2a6aa41
commit 0c27a8b
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/stream/src/task/barrier_manager.rs b/src/stream/src/task/barrier_manager.rs
@@ -311,23 +311,6 @@ impl LocalBarrierWorker {
         loop {
             select! {
                 biased;
-                (partial_graph_id, completed_epoch) = self.state.next_completed_epoch() => {
-                    let result = self.on_epoch_completed(partial_graph_id, completed_epoch);
-                    if let Err(err) = result {
-                        self.notify_other_failure(err, "failed to complete epoch").await;
-                    }
-                },
-                event = self.barrier_event_rx.recv() => {
-                    // event should not be None because the LocalBarrierManager holds a copy of tx
-                    let result = self.handle_barrier_event(event.expect("should not be none"));
-                    if let Err((actor_id, err)) = result {
-                        self.notify_actor_failure(actor_id, err, "failed to handle barrier event").await;
-                    }
-                },
-                failure = self.actor_failure_rx.recv() => {
-                    let (actor_id, err) = failure.unwrap();
-                    self.notify_actor_failure(actor_id, err, "recv actor failure").await;
-                },
                 actor_op = actor_op_rx.recv() => {
                     if let Some(actor_op) = actor_op {
                         match actor_op {
@@ -358,6 +341,23 @@ impl LocalBarrierWorker {
                         break;
                     }
                 },
+                (partial_graph_id, completed_epoch) = self.state.next_completed_epoch() => {
+                    let result = self.on_epoch_completed(partial_graph_id, completed_epoch);
+                    if let Err(err) = result {
+                        self.notify_other_failure(err, "failed to complete epoch").await;
+                    }
+                },
+                event = self.barrier_event_rx.recv() => {
+                    // event should not be None because the LocalBarrierManager holds a copy of tx
+                    let result = self.handle_barrier_event(event.expect("should not be none"));
+                    if let Err((actor_id, err)) = result {
+                        self.notify_actor_failure(actor_id, err, "failed to handle barrier event").await;
+                    }
+                },
+                failure = self.actor_failure_rx.recv() => {
+                    let (actor_id, err) = failure.unwrap();
+                    self.notify_actor_failure(actor_id, err, "recv actor failure").await;
+                },
                 request = self.control_stream_handle.next_request() => {
                     let result = self.handle_streaming_control_request(request);
                     if let Err(err) = result {