Skip to content

blueprint_loader: Remove internal last field #9497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgallagher merged 5 commits into from
Dec 12, 2025
Merged

blueprint_loader: Remove internal last field #9497

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07f7278
introduce LoadedTargetBlueprint
jgallagher Dec 9, 2025
b8bde6a
rework blueprint_planner tx channel
jgallagher Dec 9, 2025
9d7e1da
cargo fmt
jgallagher Dec 9, 2025
9adef9a
blueprint_loader: Remove internal `last` field
jgallagher Dec 9, 2025
6d9dba3
Merge branch 'main' into john/blueprint-loader-no-last
jgallagher Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions nexus/src/app/background/tasks/blueprint_load.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ pub struct LoadedTargetBlueprint {

pub struct TargetBlueprintLoader {
datastore: Arc<DataStore>,
last: Option<LoadedTargetBlueprint>,
tx: watch::Sender<Option<LoadedTargetBlueprint>>,
}

Expand All @@ -34,7 +33,7 @@ impl TargetBlueprintLoader {
datastore: Arc<DataStore>,
tx: watch::Sender<Option<LoadedTargetBlueprint>>,
) -> TargetBlueprintLoader {
TargetBlueprintLoader { datastore, last: None, tx }
TargetBlueprintLoader { datastore, tx }
}

/// Expose the target blueprint
Expand All @@ -48,10 +47,14 @@ impl BackgroundTask for TargetBlueprintLoader {
&'a mut self,
opctx: &'a OpContext,
) -> BoxFuture<'a, serde_json::Value> {
// Clone the most-recently-loaded blueprint (if any), so we can check
// whether the current target is different.
let last = self.tx.borrow().clone();

async {
// Set up a logger for this activation that includes metadata about
// the current target.
let log = match &self.last {
let log = match &last {
None => opctx.log.clone(),
Some(LoadedTargetBlueprint { blueprint, .. }) => {
opctx.log.new(o!(
Expand Down Expand Up @@ -91,7 +94,7 @@ impl BackgroundTask for TargetBlueprintLoader {
let Some(LoadedTargetBlueprint {
target: old_bp_target,
blueprint: old_blueprint,
}) = self.last.as_ref()
}) = last
else {
// We've found a target blueprint for the first time.
// Save it and notify any watchers.
Expand All @@ -103,11 +106,10 @@ impl BackgroundTask for TargetBlueprintLoader {
"target_id" => %target_id,
"time_created" => %time_created
);
self.last = Some(LoadedTargetBlueprint {
self.tx.send_replace(Some(LoadedTargetBlueprint {
target: new_bp_target,
blueprint: Arc::new(new_blueprint),
});
self.tx.send_replace(self.last.clone());
}));
return json!({
"target_id": target_id,
"time_created": time_created,
Expand All @@ -127,11 +129,10 @@ impl BackgroundTask for TargetBlueprintLoader {
"target_id" => %target_id,
"time_created" => %time_created
);
self.last = Some(LoadedTargetBlueprint {
self.tx.send_replace(Some(LoadedTargetBlueprint {
target: new_bp_target,
blueprint: Arc::new(new_blueprint),
});
self.tx.send_replace(self.last.clone());
}));
json!({
"target_id": target_id,
"time_created": time_created,
Expand All @@ -146,7 +147,7 @@ impl BackgroundTask for TargetBlueprintLoader {
// It should not be possible for the contents of a
// blueprint to change, but we check to catch possible
// bugs further up the stack.
if **old_blueprint != new_blueprint {
if *old_blueprint != new_blueprint {
let message = format!(
"blueprint for id {} changed. Blueprints are supposed \
to be immutable.",
Expand All @@ -173,11 +174,10 @@ impl BackgroundTask for TargetBlueprintLoader {
"time_created" => %time_created,
"state" => status,
);
self.last = Some(LoadedTargetBlueprint {
self.tx.send_replace(Some(LoadedTargetBlueprint {
target: new_bp_target,
blueprint: Arc::new(new_blueprint),
});
self.tx.send_replace(self.last.clone());
}));
json!({
"target_id": target_id,
"time_created": time_created,
Expand Down
Loading