Skip to content

Switch the behavior of set_target_release to set_target_release_and_old_repo #9753

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
labbott merged 1 commit into from
Feb 2, 2026
+5 −32
Merged

Switch the behavior of set_target_release to set_target_release_and_old_repo #9753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 0 additions & 27 deletions nexus/reconfigurator/planning/src/system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,33 +869,6 @@ impl SystemDescription {
pub fn set_target_release(
&mut self,
description: TargetReleaseDescription,
) -> &mut Self {
// Create a new TufRepoPolicy by bumping the generation.
let new_repo = TufRepoPolicy {
target_release_generation: self
.tuf_repo
.target_release_generation
.next(),
description,
};

let _old_repo = self.set_tuf_repo_inner(new_repo);

// It's tempting to consider setting old_repo to the current tuf_repo,
// but that requires the invariant that old_repo is always the current
// target release and that an update isn't currently in progress. See
// https://github.com/oxidecomputer/omicron/issues/8056 for some
// discussion.
//
// We provide a method to set the old repo explicitly with these
// assumptions in mind: `set_target_release_and_old_repo`.

self
}

pub fn set_target_release_and_old_repo(
&mut self,
description: TargetReleaseDescription,
) -> &mut Self {
let new_repo = TufRepoPolicy {
target_release_generation: self
Expand Down
10 changes: 5 additions & 5 deletions nexus/reconfigurator/planning/tests/integration_tests/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3158,7 +3158,7 @@ fn test_update_crucible_pantry_before_nexus() {
artifacts,
});
sim.change_description("set new target release", |desc| {
desc.set_target_release_and_old_repo(description);
desc.set_target_release(description);
Ok(())
})
.unwrap();
Expand Down Expand Up @@ -3530,7 +3530,7 @@ fn test_update_cockroach() {
artifacts,
});
sim.change_description("set new target release", |desc| {
desc.set_target_release_and_old_repo(description);
desc.set_target_release(description);
Ok(())
})
.unwrap();
Expand Down Expand Up @@ -3900,7 +3900,7 @@ fn test_update_boundary_ntp() {
artifacts,
});
sim.change_description("set new target release", |desc| {
desc.set_target_release_and_old_repo(description);
desc.set_target_release(description);
Ok(())
})
.unwrap();
Expand Down Expand Up @@ -4290,7 +4290,7 @@ fn test_update_internal_dns() {
artifacts,
});
sim.change_description("set new target release", |desc| {
desc.set_target_release_and_old_repo(description);
desc.set_target_release(description);
Ok(())
})
.unwrap();
Expand Down Expand Up @@ -4539,7 +4539,7 @@ fn test_update_all_zones() {
});

sim.change_description("set new target release", |desc| {
desc.set_target_release_and_old_repo(description);
desc.set_target_release(description);
Ok(())
})
.unwrap();
Expand Down
Loading