Skip to content

[1/n] [sled-agent] split early networking into its own crate #10448

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
sunshowers merged 4 commits into from
May 15, 2026
+68 −28
Merged

[1/n] [sled-agent] split early networking into its own crate #10448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
131edc1
[spr] initial version
sunshowers May 14, 2026
018acb7
rustfmt
sunshowers May 14, 2026
a352258
remove RSS to early networking dep
sunshowers May 15, 2026
0b7219c
rebase on main
sunshowers May 15, 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
31 changes: 25 additions & 6 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ members = [
"sled-agent/bootstrap-agent-lockstep-api",
"sled-agent/bootstrap-agent-lockstep-types",
"sled-agent/config-reconciler",
"sled-agent/early-networking",
"sled-agent/health-monitor",
"sled-agent/measurements",
"sled-agent/rack-setup",
Expand Down Expand Up @@ -335,6 +336,7 @@ default-members = [
"sled-agent/bootstrap-agent-lockstep-api",
"sled-agent/bootstrap-agent-lockstep-types",
"sled-agent/config-reconciler",
"sled-agent/early-networking",
"sled-agent/health-monitor",
"sled-agent/measurements",
"sled-agent/rack-setup",
Expand Down Expand Up @@ -792,6 +794,7 @@ sled = "=0.34.7"
sled-agent-api = { path = "sled-agent/api" }
sled-agent-client = { path = "clients/sled-agent-client" }
sled-agent-config-reconciler = { path = "sled-agent/config-reconciler" }
sled-agent-early-networking = { path = "sled-agent/early-networking" }
sled-agent-health-monitor = { path = "sled-agent/health-monitor" }
sled-agent-measurements = { path = "sled-agent/measurements" }
sled-agent-rack-setup = { path = "sled-agent/rack-setup" }
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/ls-apis/tests/api_dependencies.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ NTP Admin (client: ntp-admin-client)
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path

NTP Admin version 1 (client: ntp-admin-v1-client)
consumed by: omicron-sled-agent (omicron/sled-agent) via 2 paths
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path

External API (client: oxide-client)

Expand Down
3 changes: 1 addition & 2 deletions sled-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ nexus-config.workspace = true
nexus-lockstep-client.workspace = true
nexus-types.workspace = true
nix = { workspace = true, features = ["signal"] }
ntp-admin-v1-client.workspace = true
omicron-common.workspace = true
omicron-ledger.workspace = true
omicron-ddm-admin-client.workspace = true
Expand Down Expand Up @@ -90,6 +89,7 @@ signal-hook.workspace = true
sled-agent-api.workspace = true
sled-agent-client.workspace = true
sled-agent-config-reconciler.workspace = true
sled-agent-early-networking.workspace = true
sled-agent-health-monitor.workspace = true
sled-agent-measurements.workspace = true
sled-agent-rack-setup.workspace = true
Expand All @@ -109,7 +109,6 @@ slog-error-chain.workspace = true
slog-term.workspace = true
smf.workspace = true
sprockets-tls.workspace = true
static_assertions.workspace = true
strum.workspace = true
tar.workspace = true
thiserror.workspace = true
Expand Down
31 changes: 31 additions & 0 deletions sled-agent/early-networking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[package]
name = "sled-agent-early-networking"
version = "0.1.0"
edition.workspace = true
license = "MPL-2.0"

[lints]
workspace = true

[dependencies]
anyhow.workspace = true
# XXX NOTE this is due to https://github.com/oxidecomputer/omicron/issues/9704
# This is the R17 dpd client
# dpd-client.workspace = true
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "cc8e02a0800034c431c8cf96b889ea638da3d194" }
Comment on lines +12 to +15
Copy link
Copy Markdown
Contributor Author

@sunshowers sunshowers May 14, 2026

Choose a reason for hiding this comment

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

Is this still the status quo?

Copy link
Copy Markdown
Contributor

@jgallagher jgallagher May 15, 2026

Choose a reason for hiding this comment

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

Basically yes. I think we could bump it up to the R18 dpd client, now that R19 is shipping? But I don't know that there's a need to do that and test it.

futures.workspace = true
gateway-client.workspace = true
http.workspace = true
internal-dns-resolver.workspace = true
internal-dns-types.workspace = true
mg-admin-client.workspace = true
omicron-common.workspace = true
omicron-ddm-admin-client.workspace = true
omicron-workspace-hack.workspace = true
oxnet.workspace = true
rdb-types.workspace = true
sled-agent-types.workspace = true
slog.workspace = true
slog-error-chain.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = ["full"] }
4 changes: 4 additions & 0 deletions ...-agent/rack-setup/src/early_networking.rs → sled-agent/early-networking/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ use sled_agent_types::early_networking::{
use sled_agent_types::sled::ThisSledSwitchZoneUnderlayIpAddr;
use sled_agent_types::system_networking::SystemNetworkingConfig;
use slog::Logger;
use slog::error;
use slog::info;
use slog::o;
use slog::warn;
use slog_error_chain::InlineErrorChain;
use std::collections::{HashMap, HashSet};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
Expand Down
9 changes: 1 addition & 8 deletions sled-agent/rack-setup/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,13 @@ cancel-safe-futures.workspace = true
chrono.workspace = true
cockroach-admin-client.workspace = true
dns-service-client.workspace = true
# XXX NOTE this is due to https://github.com/oxidecomputer/omicron/issues/9704
# This is the R17 dpd client
# dpd-client.workspace = true
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "cc8e02a0800034c431c8cf96b889ea638da3d194" }
futures.workspace = true
gateway-client.workspace = true
http.workspace = true
iddqd.workspace = true
illumos-utils.workspace = true
internal-dns-resolver.workspace = true
internal-dns-types.workspace = true
itertools.workspace = true
mg-admin-client.workspace = true
nexus-lockstep-client.workspace = true
nexus-types.workspace = true
ntp-admin-client.workspace = true
Expand All @@ -38,8 +32,7 @@ omicron-ledger.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
oxnet.workspace = true
rand = { workspace = true, features = ["os_rng"] }
rdb-types.workspace = true
rand.workspace = true
reqwest = { workspace = true, features = ["rustls", "stream"] }
schemars = { workspace = true, features = ["chrono", "uuid1"] }
serde.workspace = true
Expand Down
3 changes: 0 additions & 3 deletions sled-agent/rack-setup/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
#[macro_use]
extern crate slog;

mod early_networking;
mod plan;
mod service;

pub use early_networking::EarlyNetworkSetup;
pub use early_networking::EarlyNetworkSetupError;
pub use plan::service::PlannedSledDescription;
pub use plan::service::ServicePlan;
pub use plan::service::SledConfig;
Expand Down
6 changes: 0 additions & 6 deletions sled-agent/rack-setup/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
//! after a clean slate upon failure.
//! See <https://github.com/oxidecomputer/omicron/issues/7174> for details.

use crate::early_networking::EarlyNetworkSetupError;
use crate::plan::service::PlanError as ServicePlanError;
use crate::plan::service::ServicePlan;
use crate::plan::sled::SledPlan;
Expand Down Expand Up @@ -265,11 +264,6 @@ pub enum SetupServiceError {
#[error("Failed to construct valid set of service zone NAT entries")]
InvalidServiceZoneNatEntries(#[from] ServiceZoneNatEntriesError),

// We used transparent, because `EarlyNetworkSetupError` contains a subset
// of error variants already in this type
#[error(transparent)]
EarlyNetworkSetup(#[from] EarlyNetworkSetupError),
Comment on lines -268 to -271
Copy link
Copy Markdown
Contributor Author

@sunshowers sunshowers May 15, 2026

Choose a reason for hiding this comment

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

I believe #10370 made this unused, meaning that the RSS crate no longer depends on the early networking crate.

Copy link
Copy Markdown
Contributor

@jgallagher jgallagher May 15, 2026

Choose a reason for hiding this comment

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

Oh! I didn't realize that was the only RSS use; that's great. Should we move early_networking back into sled-agent proper? (I don't have strong feelings either way - seems fine to me to leave it separate as you have on this branch.)

Copy link
Copy Markdown
Contributor Author

@sunshowers sunshowers May 15, 2026

Choose a reason for hiding this comment

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

Mild preference for just leaving it separate.


#[error("Rack already initialized")]
RackAlreadyInitialized,

Expand Down
2 changes: 1 addition & 1 deletion sled-agent/src/services.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ use omicron_common::backoff::{
use omicron_common::disk::{DatasetKind, DatasetName};
use omicron_ddm_admin_client::DdmError;
use omicron_uuid_kinds::OmicronZoneUuid;
use sled_agent_rack_setup::{EarlyNetworkSetup, EarlyNetworkSetupError};
use sled_agent_early_networking::{EarlyNetworkSetup, EarlyNetworkSetupError};
use sled_agent_resolvable_files::{
ZoneImageSourceResolver, ramdisk_file_source,
};
Expand Down
2 changes: 1 addition & 1 deletion sled-agent/src/sled_agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ use sled_agent_config_reconciler::{
InternalDisksReceiver, LedgerNewConfigError, LedgerTaskError,
ReconcilerInventory, SledAgentFacilities,
};
use sled_agent_early_networking::EarlyNetworkSetupError;
use sled_agent_health_monitor::handle::HealthMonitorHandle;
use sled_agent_measurements::MeasurementsHandle;
use sled_agent_rack_setup::EarlyNetworkSetupError;
use sled_agent_types::attached_subnet::AttachedSubnet;
use sled_agent_types::attached_subnet::AttachedSubnets;
use sled_agent_types::dataset::LocalStorageDatasetDeleteRequest;
Expand Down
Loading