WIP: flesh out new implementation

oxidecomputer · Jul 6, 2024 · 609697e · 609697e
1 parent 14c5dd9
commit 609697e
Show file tree

Hide file tree

Showing 5 changed files with 368 additions and 61 deletions.
diff --git a/nexus/db-model/src/lib.rs b/nexus/db-model/src/lib.rs
@@ -176,6 +176,7 @@ pub use region_replacement_step::*;
 pub use region_snapshot::*;
 pub use role_assignment::*;
 pub use role_builtin::*;
+pub use saga_types::*;
 pub use schema_versions::*;
 pub use semver_version::*;
 pub use service_kind::*;

diff --git a/nexus/src/app/background/init.rs b/nexus/src/app/background/init.rs
@@ -121,11 +121,11 @@ use nexus_config::BackgroundTaskConfig;
 use nexus_config::DnsTasksConfig;
 use nexus_db_model::DnsGroup;
 use nexus_db_queries::context::OpContext;
-use nexus_db_queries::db;
 use nexus_db_queries::db::DataStore;
 use oximeter::types::ProducerRegistry;
 use std::collections::BTreeMap;
 use std::sync::Arc;
+use tokio::sync::mpsc;
 use tokio::sync::watch;
 use uuid::Uuid;
 
@@ -661,6 +661,7 @@ impl BackgroundTasksInitializer {
                 args.saga_recovery_nexus,
                 args.saga_recovery_sec,
                 args.saga_recovery_registry,
+                args.saga_recovery_rx,
             ));
 
             driver.register(TaskDefinition {
@@ -707,6 +708,8 @@ pub struct BackgroundTasksData {
     pub saga_recovery_sec: Arc<steno::SecClient>,
     /// Steno (saga) action registry
     pub saga_recovery_registry: Arc<ActionRegistry>,
+    /// Channel for receiving notifications about newly-created sagas
+    pub saga_recovery_rx: mpsc::UnboundedReceiver<steno::SagaId>,
 }
 
 /// Starts the three DNS-propagation-related background tasks for either