Skip to content

Don't fail active bundles with expunged Nexuses (reassign only) #9286

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 2 commits into from
Oct 28, 2025
Merged

Don't fail active bundles with expunged Nexuses (reassign only) #9286

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24397a5
[bundles] Don't fail fully-collected bundles with expunged Nexuses (r…
smklein Oct 27, 2025
cfc1130
formatting
smklein Oct 28, 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
88 changes: 52 additions & 36 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 @@ -324,7 +324,7 @@ impl DataStore {
.execute_async(conn)
.await?;

// Find all bundles on nexuses that no longer exist.
// Find all bundles managed by nexuses that no longer exist.
let bundles_with_bad_nexuses = dsl::support_bundle
.filter(dsl::assigned_nexus.eq_any(invalid_nexus_zones))
.select(SupportBundle::as_select())
Expand All @@ -333,15 +333,42 @@ impl DataStore {

let bundles_to_mark_failing = bundles_with_bad_nexuses
.iter()
.map(|b| b.id)
.filter_map(|bundle| {
match bundle.state {
// If the Nexus died mid-collection, we'll mark
// this bundle failing. This should ensure that
// any storage it might have been using is
// cleaned up.
SupportBundleState::Collecting => Some(bundle.id),
// If the bundle was marked "active", we need to
// re-assign the "owning Nexus" so it can later
// be deleted, but the bundle itself has already
// been stored on a sled.
//
// There's no need to fail it.
SupportBundleState::Active |
// If the bundle has already been marked
// "Destroying/Failing/Failed", it's already
// irreversibly marked for deletion.
SupportBundleState::Destroying |
SupportBundleState::Failing |
SupportBundleState::Failed => None,
Copy link
Member

@hawkw hawkw Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation here feels weird but I guess that's what rustfmt wanted... i kinda wonder if it would be nicer to split the two patterns with separate comments, so it doesn't feel like the second comment about deleted bundles is indented "under" the first comment?

this is persnickety and it does not matter.

Suggested change
// If the bundle was marked "active", we need to
// re-assign the "owning Nexus" so it can later
// be deleted, but the bundle itself has already
// been stored on a sled.
//
// There's no need to fail it.
SupportBundleState::Active |
// If the bundle has already been marked
// "Destroying/Failing/Failed", it's already
// irreversibly marked for deletion.
SupportBundleState::Destroying |
SupportBundleState::Failing |
SupportBundleState::Failed => None,
// If the bundle was marked "active", we need to
// re-assign the "owning Nexus" so it can later
// be deleted, but the bundle itself has already
// been stored on a sled.
//
// There's no need to fail it.
SupportBundleState::Active => None,
// If the bundle has already been marked
// "Destroying/Failing/Failed", it's already
// irreversibly marked for deletion.
SupportBundleState::Destroying |
SupportBundleState::Failing |
SupportBundleState::Failed => None,

Copy link
Collaborator Author

@smklein smklein Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated!

}
})
.collect::<Vec<_>>();

let bundles_to_reassign = bundles_with_bad_nexuses
.iter()
.filter_map(|bundle| {
if bundle.state != SupportBundleState::Failed {
Some(bundle.id)
} else {
None
match bundle.state {
// If the bundle might be using any storage on
// the provisioned sled, it gets assigned to a
// new Nexus.
SupportBundleState::Collecting |
SupportBundleState::Active |
SupportBundleState::Destroying |
SupportBundleState::Failing => Some(bundle.id),
SupportBundleState::Failed => None,
}
})
.collect::<Vec<_>>();
Expand Down Expand Up @@ -371,30 +398,21 @@ impl DataStore {
bundles_reassigned: 0,
};

// Exit a little early if there are no bundles to re-assign.
//
// This is a tiny optimization, but really, it means that
// tests without Nexuses in their blueprints can succeed if
// they also have no support bundles. In practice, this is
// rare, but in our existing test framework, it's fairly
// common.
if bundles_to_reassign.is_empty() {
return Ok(report);
if !bundles_to_reassign.is_empty() {
// Reassign bundles that haven't been marked "fully failed"
// to ourselves, so we can free their storage if they have
// been provisioned on a sled.
report.bundles_reassigned =
diesel::update(dsl::support_bundle)
.filter(dsl::id.eq_any(bundles_to_reassign))
.set(
dsl::assigned_nexus
.eq(our_nexus_id.into_untyped_uuid()),
)
.execute_async(conn)
.await?;
Comment on lines +405 to +417
Copy link
Member

@hawkw hawkw Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

took me a moment to realize that the only diff here is that we changed the if from an early return to just making the update query conditional --- but i agree that this feels less convoluted than the early return, especially if we wanted to add additional code that runs after this query later.

Copy link
Collaborator Author

@smklein smklein Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it felt like "I didn't need an extra comment to explain an early return", because it's self-explanatory that we'd only want to update rows if there are rows to be updated

}

// Reassign bundles that haven't been marked "fully failed"
// to ourselves, so we can free their storage if they have
// been provisioned on a sled.
report.bundles_reassigned =
diesel::update(dsl::support_bundle)
.filter(dsl::id.eq_any(bundles_to_reassign))
.set(
dsl::assigned_nexus
.eq(our_nexus_id.into_untyped_uuid()),
)
.execute_async(conn)
.await?;

Ok(report)
}
.boxed()
Expand Down Expand Up @@ -1442,7 +1460,7 @@ mod test {

assert_eq!(
SupportBundleExpungementReport {
bundles_failing_missing_nexus: 1,
bundles_failing_missing_nexus: 0,
bundles_reassigned: 1,
..Default::default()
},
Expand All @@ -1452,13 +1470,11 @@ mod test {
let observed_bundle = datastore
.support_bundle_get(&opctx, bundle.id.into())
.await
.expect("Should be able to get bundle we just failed");
assert_eq!(SupportBundleState::Failing, observed_bundle.state);
assert!(
observed_bundle
.reason_for_failure
.unwrap()
.contains(FAILURE_REASON_NO_NEXUS)
.expect("Should be able to get bundle we reassigned");
assert_eq!(SupportBundleState::Active, observed_bundle.state);
assert_eq!(
observed_bundle.assigned_nexus.unwrap(),
nexus_ids[1].into(),
);

db.terminate().await;
Expand Down
Loading