bit more cleanup

oxidecomputer · Jul 3, 2024 · f34b2e3 · f34b2e3
1 parent 17b8e76
commit f34b2e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/nexus/src/app/background/tasks/region_replacement.rs b/nexus/src/app/background/tasks/region_replacement.rs
@@ -19,7 +19,6 @@ use crate::app::sagas::NexusSaga;
 use crate::app::RegionAllocationStrategy;
 use futures::future::BoxFuture;
 use futures::FutureExt;
-use futures::TryFutureExt;
 use nexus_db_model::RegionReplacement;
 use nexus_db_queries::context::OpContext;
 use nexus_db_queries::db::DataStore;
@@ -50,9 +49,8 @@ impl RegionReplacementDetector {
                 RegionAllocationStrategy::RandomWithDistinctSleds { seed: None },
         };
 
-        futures::future::ready(SagaRegionReplacementStart::prepare(&params))
-            .and_then(|saga_dag| self.sagas.saga_start(saga_dag))
-            .await
+        let saga_dag = SagaRegionReplacementStart::prepare(&params)?;
+        self.sagas.saga_start(saga_dag).await
     }
 }
 

diff --git a/nexus/src/app/background/tasks/region_replacement_driver.rs b/nexus/src/app/background/tasks/region_replacement_driver.rs
@@ -27,7 +27,6 @@ use crate::app::sagas::region_replacement_finish::SagaRegionReplacementFinish;
 use crate::app::sagas::NexusSaga;
 use futures::future::BoxFuture;
 use futures::FutureExt;
-use futures::TryFutureExt;
 use nexus_db_queries::context::OpContext;
 use nexus_db_queries::db::DataStore;
 use nexus_types::internal_api::background::RegionReplacementDriverStatus;
@@ -124,10 +123,11 @@ impl RegionReplacementDriver {
                     serialized_authn: authn::saga::Serialized::for_opctx(opctx),
                     request,
                 };
-                let result = futures::future::ready(
-                    SagaRegionReplacementDrive::prepare(&params),
-                )
-                .and_then(|saga_dag| self.sagas.saga_start(saga_dag))
+                let result = async {
+                    let saga_dag =
+                        SagaRegionReplacementDrive::prepare(&params)?;
+                    self.sagas.saga_start(saga_dag).await
+                }
                 .await;
                 match result {
                     Ok(_) => {
@@ -194,10 +194,10 @@ impl RegionReplacementDriver {
                 region_volume_id: old_region_volume_id,
                 request,
             };
-            let result = futures::future::ready(
-                SagaRegionReplacementFinish::prepare(&params),
-            )
-            .and_then(|saga_dag| self.sagas.saga_start(saga_dag))
+            let result = async {
+                let saga_dag = SagaRegionReplacementFinish::prepare(&params)?;
+                self.sagas.saga_start(saga_dag).await
+            }
             .await;
             match result {
                 Ok(_) => {