Skip to content

[reconfigurator] Add "expunged and unreferenced" zones to PlanningInput #9730

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

Open
jgallagher wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[reconfigurator] Add "expunged and unreferenced" zones to PlanningInput #9730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ede6a9
add expunged_and_unreferenced
jgallagher Dec 11, 2025
73da04c
input/builder helper methods
jgallagher Jan 13, 2026
4a4f0a0
initial collecting "expunged and unreferenced"
jgallagher Jan 14, 2026
97d3b23
flesh out oximeter reference check
jgallagher Jan 16, 2026
c2eb0e3
flesh out is_nexus_referenced()
jgallagher Jan 27, 2026
5cad9b2
docs on static_check_all_reasons_handled()
jgallagher Jan 27, 2026
1315325
cleanup and comments
jgallagher Jan 27, 2026
c80d7e6
cargo fmt
jgallagher Jan 27, 2026
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
48 changes: 31 additions & 17 deletions nexus/db-queries/src/db/datastore/saga.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ use nexus_auth::context::OpContext;
use nexus_db_errors::ErrorHandler;
use nexus_db_errors::public_error_from_diesel;
use nexus_db_model::SagaState;
use omicron_common::api::external::DataPageParams;
use omicron_common::api::external::Error;
use omicron_common::api::external::LookupType;
use omicron_common::api::external::ResourceType;
use std::ops::Add;
use uuid::Uuid;

impl DataStore {
pub async fn saga_create(
Expand Down Expand Up @@ -130,6 +132,27 @@ impl DataStore {
}
}

/// Returns a single page of unfinished sagas assigned to SEC `sec_id`.
pub async fn saga_list_recovery_candidates(
&self,
opctx: &OpContext,
sec_id: db::saga_types::SecId,
pagparams: &DataPageParams<'_, Uuid>,
) -> Result<Vec<db::saga_types::Saga>, Error> {
use nexus_db_schema::schema::saga::dsl;
let conn = self.pool_connection_authorized(opctx).await?;
paginated(dsl::saga, dsl::id, pagparams)
.filter(
dsl::saga_state.eq_any(SagaState::RECOVERY_CANDIDATE_STATES),
)
.filter(dsl::current_sec.eq(sec_id))
.select(db::saga_types::Saga::as_select())
.load_async(&*conn)
.await
.map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))
}

/// many queries as needed (in batches) to get them all
Copy link
Collaborator

@davepacheco davepacheco Jan 29, 2026

Choose a reason for hiding this comment

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

I think this is a stray line

/// Returns a list of unfinished sagas assigned to SEC `sec_id`, making as
/// many queries as needed (in batches) to get them all
pub async fn saga_list_recovery_candidates_batched(
Expand All @@ -142,25 +165,16 @@ impl DataStore {
SQL_BATCH_SIZE,
dropshot::PaginationOrder::Ascending,
);
let conn = self.pool_connection_authorized(opctx).await?;
while let Some(p) = paginator.next() {
use nexus_db_schema::schema::saga::dsl;

let mut batch =
paginated(dsl::saga, dsl::id, &p.current_pagparams())
.filter(
dsl::saga_state
.eq_any(SagaState::RECOVERY_CANDIDATE_STATES),
)
.filter(dsl::current_sec.eq(sec_id))
.select(db::saga_types::Saga::as_select())
.load_async(&*conn)
.await
.map_err(|e| {
public_error_from_diesel(e, ErrorHandler::Server)
})?;
let mut batch = self
.saga_list_recovery_candidates(
opctx,
sec_id,
&p.current_pagparams(),
)
.await?;

paginator = p.found_batch(&batch, &|row| row.id);
paginator = p.found_batch(&batch, &|row| row.id.0.0);
sagas.append(&mut batch);
}
Ok(sagas)
Expand Down
Loading
Loading