earlier change was overzealous

nexus/src/app/background/tasks/saga_recovery/recovery.rs

@@ -22,7 +22,6 @@ use tokio::sync::mpsc;
 /// multiple passes
 pub struct RestState {
     sagas_started: BTreeMap<steno::SagaId, SagaStartInfo>,
-    sagas_started_rx: mpsc::UnboundedReceiver<steno::SagaId>,
     remove_next: Vec<steno::SagaId>,
 }
 
@@ -38,21 +37,18 @@ enum SagaStartSource {
 }
 
 impl RestState {
-    pub fn new(
-        sagas_started_rx: mpsc::UnboundedReceiver<steno::SagaId>,
-    ) -> RestState {
-        RestState {
-            sagas_started: BTreeMap::new(),
-            sagas_started_rx,
-            remove_next: Vec::new(),
-        }
+    pub fn new() -> RestState {
+        RestState { sagas_started: BTreeMap::new(), remove_next: Vec::new() }
     }
 
     /// Read messages from the channel (signaling sagas that have started
     /// running) and update our set of sagas that we believe to be running.
-    pub fn update_started_sagas(&mut self, log: &slog::Logger) {
-        let (new_sagas, disconnected) =
-            read_all_from_channel(&mut self.sagas_started_rx);
+    pub fn update_started_sagas(
+        &mut self,
+        log: &slog::Logger,
+        sagas_started_rx: &mut mpsc::UnboundedReceiver<steno::SagaId>,
+    ) {
+        let (new_sagas, disconnected) = read_all_from_channel(sagas_started_rx);
         if disconnected {
             warn!(
                 log,

nexus/src/app/background/tasks/saga_recovery/task.rs

@@ -168,6 +168,7 @@ pub struct SagaRecovery {
     nexus: Arc<Nexus>,
     sec_client: Arc<steno::SecClient>,
     registry: Arc<ActionRegistry>,
+    sagas_started_rx: mpsc::UnboundedReceiver<steno::SagaId>,
 
     /// recovery state persisted between passes
     rest_state: recovery::RestState,
@@ -193,7 +194,8 @@ impl SagaRecovery {
             nexus,
             sec_client: sec,
             registry,
-            rest_state: recovery::RestState::new(sagas_started_rx),
+            sagas_started_rx,
+            rest_state: recovery::RestState::new(),
             status: status::Report::new(),
         }
     }
@@ -325,7 +327,8 @@ impl BackgroundTask for SagaRecovery {
             // was immediately created and showed up in our candidate list, we'd
             // erroneously conclude that it needed to be recovered when in fact
             // it was already running.
-            self.rest_state.update_started_sagas(log);
+            self.rest_state
+                .update_started_sagas(log, &mut self.sagas_started_rx);
 
             match result {
                 Ok(db_sagas) => {