[4/n] split RSS into its own crate by sunshowers · Pull Request #10340 · oxidecomputer/omicron

sunshowers · 2026-04-29T00:27:11Z

With this change, the RSS code now lives in a separate crate from Sled Agent so that it is harder for cockroach-admin-client and dns-service-client (and any future RSS-only deps) to become dependencies of the real Sled Agent.

Also update api-manifest.toml.

Closes #10339.

Created using spr 1.3.6-beta.1 [skip ci]

Created using spr 1.3.6-beta.1

sunshowers · 2026-04-29T00:47:05Z

 restricted_to_consumers = [
-     { name = "omicron-sled-agent", reason = "Only RSS uses this API and it is not part of upgrade" },
+     { name = "omicron-sled-agent", reason = "Only RSS and sled-agent-sim use this API, neither of which is part of upgrade" },
 ]


Realized while doing this that both RSS and the simulated Sled Agent use this API, so updated this message.

sunshowers · 2026-04-29T00:47:21Z

+/// Operations RSS performs on the local bootstrap-agent during rack setup.
+///
+/// This trait is implemented by sled-agent.
+#[async_trait]
+pub trait LocalBootstrapAgent: Send + Sync {


This is the callback interface.

Created using spr 1.3.6-beta.1

sunshowers · 2026-04-30T04:12:38Z

-    /// This dependency is only used during RSS, not during normal operation or
-    /// upgrade. Like `NonDag`, this means the dependency should not be part of
-    /// the update DAG. Unlike `NonDag`, this does not require that the target
-    /// API uses client-side versioning.
-    RssOnly,


We get to drop what we just introduced in #10099 lol

sunshowers · 2026-04-30T04:15:33Z


 #[derive(Clone, Debug)]
-pub struct Plan {
+pub struct ServicePlan {


There were a few spots where we were doing Plan as ServicePlan which is a bit awkward, so I took the opportunity to change this to just be ServicePlan.

sunshowers · 2026-04-30T04:18:42Z

    BfdMode, BgpConfig, BgpPeerConfig, ImportExportPolicy, PortConfig, PortFec,
    PortSpeed, RouterPeerType, SwitchSlot, UplinkAddress,
 };
+use sled_agent_types::sled::ThisSledSwitchZoneUnderlayIpAddr;


I chose to put early networking in the new sled-agent-rack-setup crate. But another option is to put it in a new sled-agent-early-networking crate. What do y'all think?

All of this is going away over the next couple of releases as a part of #10167 as the functionality moves into sled-agent-scrimlet-reconcilers. I'm on board with just moving it here for simplicity.

sunshowers · 2026-04-30T04:21:18Z

        let rss = RackSetupService::new_reset_rack(
            log.new(o!("component" => "RSS")),
-            tx,
+            Box::new(tx),
+            our_bootstrap_address,


I felt that moving the bootstrap address to the LocalBootstrapAgent trait (which is more of a one-shot interface) was a little weird, so I turned it into an argument over here. I can revert this change if you prefer.

sunshowers · 2026-04-30T04:22:29Z


 pub const SWITCH_ZONE_BASEBOARD_FILE: &str = "/opt/oxide/baseboard.json";
+
+pub use self::local_switch_zone_ip::ThisSledSwitchZoneUnderlayIpAddr;


This moves into sled-agent-types. (I believe this will conflict with one of John's PRs, but I also think the resolution of the conflict is to move it here anyway.

sunshowers · 2026-04-30T05:20:47Z

 }

-impl Plan {
+impl SledPlan {


Same here: turned this into SledPlan for similar reasons.

jgallagher

Thanks, this is way simpler than I would have expected 😅

jgallagher · 2026-04-30T16:04:00Z

    BfdMode, BgpConfig, BgpPeerConfig, ImportExportPolicy, PortConfig, PortFec,
    PortSpeed, RouterPeerType, SwitchSlot, UplinkAddress,
 };
+use sled_agent_types::sled::ThisSledSwitchZoneUnderlayIpAddr;


All of this is going away over the next couple of releases as a part of #10167 as the functionality moves into sled-agent-scrimlet-reconcilers. I'm on board with just moving it here for simplicity.

Created using spr 1.3.6-beta.1

This is groundwork for #10167, and introduces the skeleton of network config reconcilers for use within sled-agent. None of this is wired up yet and all the service-specific reconcilers are placeholders, but it does have the real setup for how these tasks get started and how they report status. The PR is pretty big but hopefully not too bad to review; more than half the code falls into either "tests", "status type definitions", or "placeholder/dummy reconcilers". A tentative suggestion for review order is: 1. The crate-level docs in `lib.rs`; these are written assuming #10167 is complete, not based on the current state of the crate. 2. `handle.rs`, particularly `ScrimletReconcilers` - this is the entry point for sled-agent. It will hold a `ScrimletReconcilers` in its set of long-running tasks. 3. `reconciler_task.rs` - this implements the common control flow for all of the service-specific reconcilers in the crate; handling periodic reactivation, activation when the config changes, transitioning to inert if we stop being a scrimlet because the sidecar goes away at runtime, and transitioning out of inert if it comes back. ~~The only production-affecting change here is that the `ThisSledSwitchZoneUnderlayIpAddr` type moved out of sled-agent and into this crate, so sled-agent depends on this crate just for that type.~~ Edit: As of #10340, `ThisSledSwitchZoneUnderlayIpAddr` has moved to `sled-agent-types`, so now this PR uses it from there and makes no changes to sled-agent proper.

sunshowers added 4 commits April 28, 2026 17:27

[spr] changes to main this commit is based on

3062892

Created using spr 1.3.6-beta.1 [skip ci]

[spr] initial version

4994be6

Created using spr 1.3.6-beta.1

self-review

e27a481

Created using spr 1.3.6-beta.1

cargo fmt

114d293

Created using spr 1.3.6-beta.1

sunshowers commented Apr 29, 2026

View reviewed changes

sunshowers added 5 commits April 28, 2026 17:54

more simplification

8b49128

Created using spr 1.3.6-beta.1

more cleanup found along the way

16cd700

Created using spr 1.3.6-beta.1

sorry

4be4d3e

Created using spr 1.3.6-beta.1

update snapshots + fmt

f0aedc6

Created using spr 1.3.6-beta.1

remove rss-only

f0923cc

Created using spr 1.3.6-beta.1

sunshowers changed the base branch from sunshowers/spr/main.4n-wip-split-rss-into-its-own-crate to main April 30, 2026 04:11

sunshowers added 3 commits April 29, 2026 21:11

rebase on main

fd4964f

Created using spr 1.3.6-beta.1

clippy

99b6e8b

Created using spr 1.3.6-beta.1

fix up a couple of sled::Plan

6097080

Created using spr 1.3.6-beta.1

sunshowers commented Apr 30, 2026

View reviewed changes

sunshowers changed the title ~~[4/n] [wip] split RSS into its own crate~~ [4/n] split RSS into its own crate Apr 30, 2026

sunshowers marked this pull request as ready for review April 30, 2026 05:21

sunshowers requested review from andrewjstone and jgallagher April 30, 2026 05:21

jgallagher approved these changes Apr 30, 2026

View reviewed changes

review feedback

63f5023

Created using spr 1.3.6-beta.1

sunshowers enabled auto-merge (squash) April 30, 2026 19:07

sunshowers merged commit f960aad into main Apr 30, 2026
18 checks passed

sunshowers deleted the sunshowers/spr/4n-wip-split-rss-into-its-own-crate branch April 30, 2026 19:51

jgallagher mentioned this pull request Apr 30, 2026

Introduce sled-agent-scrimlet-reconcilers crate #10313

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[4/n] split RSS into its own crate#10340

[4/n] split RSS into its own crate#10340
sunshowers merged 13 commits into
mainfrom
sunshowers/spr/4n-wip-split-rss-into-its-own-crate

sunshowers commented Apr 29, 2026 •

edited

Loading

Uh oh!

sunshowers Apr 29, 2026

Uh oh!

sunshowers Apr 29, 2026

Uh oh!

sunshowers Apr 30, 2026

Uh oh!

sunshowers Apr 30, 2026

Uh oh!

sunshowers Apr 30, 2026

Uh oh!

jgallagher Apr 30, 2026

Uh oh!

sunshowers Apr 30, 2026

Uh oh!

sunshowers Apr 30, 2026

Uh oh!

sunshowers Apr 30, 2026

Uh oh!

jgallagher left a comment

Uh oh!

jgallagher Apr 30, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		pub const SWITCH_ZONE_BASEBOARD_FILE: &str = "/opt/oxide/baseboard.json";

		pub use self::local_switch_zone_ip::ThisSledSwitchZoneUnderlayIpAddr;

Conversation

sunshowers commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jgallagher left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sunshowers commented Apr 29, 2026 •

edited

Loading