Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions sled-agent/config-reconciler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ workspace = true
[dependencies]
anyhow.workspace = true
async-trait.workspace = true
bytes.workspace = true
camino.workspace = true
camino-tempfile.workspace = true
chrono.workspace = true
Expand All @@ -27,6 +28,7 @@ nexus-sled-agent-shared.workspace = true
omicron-common.workspace = true
omicron-uuid-kinds.workspace = true
serde.workspace = true
sha2.workspace = true
sled-agent-api.workspace = true
sled-agent-types.workspace = true
sled-hardware.workspace = true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Seeds for failure cases proptest has generated in the past. It is
# automatically read and these particular cases re-run before any
# novel cases are generated.
#
# It is recommended to check this file in to source control so that
# everyone who runs the test benefits from these saved cases.
cc dae3bb9081ff9f94d9c588fb2d535df1ef72b8af5169dc8bc5072ee99e6ee72b # shrinks to input = _ProptestReadValidHostPhase2Args { data: [], block_size: 512 }
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ pub(crate) struct DatasetTaskHandle(mpsc::Sender<DatasetTaskRequest>);
impl DatasetTaskHandle {
// For testing, create a handle on which requests will always fail with a
// `DatasetTaskError`.
#[cfg(any(test, feature = "testing"))]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this "testing" feature still being used?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is in other places, but this method isn't accessible outside the crate, so clippy complained about it being dead code.

#[cfg(test)]
pub(crate) fn spawn_noop() -> Self {
let (tx, _rx) = mpsc::channel(1);
Self(tx)
Expand Down
11 changes: 1 addition & 10 deletions sled-agent/config-reconciler/src/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ impl ConfigReconcilerHandle {
current_config_rx,
reconciler_result_tx,
currently_managed_zpools_tx,
self.internal_disks_rx.clone(),
external_disks_tx,
raw_disks_rx,
Arc::clone(&self.destroy_orphans),
Expand Down Expand Up @@ -420,16 +421,6 @@ impl ConfigReconcilerHandle {
}
}

#[derive(Debug)]
struct ReconcilerTaskDependencies {
key_requester: StorageKeyRequester,
time_sync_config: TimeSyncConfig,
reconciler_result_tx: watch::Sender<ReconcilerResult>,
currently_managed_zpools_tx: watch::Sender<Arc<CurrentlyManagedZpools>>,
ledger_task_log: Logger,
reconciler_task_log: Logger,
}

/// Fields of sled-agent inventory reported by the config reconciler subsystem.
///
/// Note that much like inventory in general, these fields are not collected
Expand Down
Loading
Loading