Skip to content

[reconfigurator] Executor: only do cleanup for zones that are ready_for_cleanup #7713

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
merged 13 commits into from
Mar 4, 2025
Merged

[reconfigurator] Executor: only do cleanup for zones that are ready_for_cleanup #7713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
828fff3
clean_up_expunged_zones: act on zones ready for cleanup
jgallagher Feb 21, 2025
bd4a86d
support_bundle_fail_expunged: act on zones ready for cleanup
jgallagher Feb 21, 2025
e33103a
reassign_sagas_from_expunged: act on zones ready for cleanup
jgallagher Feb 21, 2025
a347074
make more step failures not stop execution
jgallagher Feb 25, 2025
1f6020d
result_to_step_result -> map_err_to_step_warning
jgallagher Feb 25, 2025
fc7581c
more consistent error reporting: cockroachdb settings step
jgallagher Feb 25, 2025
5b5bd7f
remove `finalize` step (most steps can emit warnings now)
jgallagher Feb 25, 2025
eab96e1
cargo fmt
jgallagher Mar 3, 2025
b6253ee
comments and dead code removal
jgallagher Mar 3, 2025
c465f26
Merge branch 'main' into john/execution-ready-for-cleanup
jgallagher Mar 3, 2025
365f144
Merge branch 'main' into john/execution-ready-for-cleanup
jgallagher Mar 4, 2025
be02ab4
typo
jgallagher Mar 4, 2025
7924b9b
fix test (put zones failure doesn't fail entire execution anymore)
jgallagher Mar 4, 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
16 changes: 6 additions & 10 deletions nexus/db-queries/src/db/datastore/support_bundle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use crate::transaction_retry::OptionalError;
use async_bb8_diesel::AsyncRunQueryDsl;
use diesel::prelude::*;
use futures::FutureExt;
use nexus_types::deployment::BlueprintZoneDisposition;
use omicron_common::api::external;
use omicron_common::api::external::CreateResult;
use omicron_common::api::external::DataPageParams;
Expand Down Expand Up @@ -215,16 +216,12 @@ impl DataStore {
) -> Result<SupportBundleExpungementReport, Error> {
opctx.authorize(authz::Action::Modify, &authz::FLEET).await?;

// For this blueprint: The set of all expunged Nexus zones
// For this blueprint: The set of all expunged Nexus zones that are
// ready for cleanup
let invalid_nexus_zones = blueprint
.all_omicron_zones(
nexus_types::deployment::BlueprintZoneDisposition::is_expunged,
)
.all_omicron_zones(BlueprintZoneDisposition::is_ready_for_cleanup)
.filter_map(|(_sled, zone)| {
if matches!(
zone.zone_type,
nexus_types::deployment::BlueprintZoneType::Nexus(_)
) {
if zone.zone_type.is_nexus() {
Some(zone.id.into_untyped_uuid())
} else {
None
Expand Down Expand Up @@ -484,7 +481,6 @@ mod test {
use nexus_types::deployment::Blueprint;
use nexus_types::deployment::BlueprintDatasetDisposition;
use nexus_types::deployment::BlueprintDatasetFilter;
use nexus_types::deployment::BlueprintZoneDisposition;
use nexus_types::deployment::BlueprintZoneType;
use omicron_common::api::external::LookupType;
use omicron_common::api::internal::shared::DatasetKind::Debug as DebugDatasetKind;
Expand Down Expand Up @@ -985,7 +981,7 @@ mod test {
if zone.id == bundle.assigned_nexus.unwrap().into() {
zone.disposition = BlueprintZoneDisposition::Expunged {
as_of_generation: *Generation::new(),
ready_for_cleanup: false,
ready_for_cleanup: true,
};
}
}
Expand Down
Loading
Loading