Skip to content

Bump crucible to latest, update Omicron, use explicit revs#1141

Merged
jmpesp merged 1 commit into
masterfrom
bump_crucible_and_explicit_rev
May 14, 2026
Merged

Bump crucible to latest, update Omicron, use explicit revs#1141
jmpesp merged 1 commit into
masterfrom
bump_crucible_and_explicit_rev

Conversation

@jmpesp

@jmpesp jmpesp commented May 14, 2026

Copy link
Copy Markdown
Contributor

Pick up the following Crucible PRs:

Also, similar to oxidecomputer/crucible#1936, switch the omicron related dependencies from 'branch = "main"' to an explicit rev. Previous to this commit, two old versions of omicron were being pulled in: becbbb61 and b8efb9a0. The first one is about 300 commits behind, and the second is about 700 commits behind. With explicit git revs, the rev being used moves to Cargo.toml, and is known without digging into the lockfile.

Related, the tokio dep had to be further specified in order to build.

Pick up the following Crucible PRs:

- Use an explicit rev for oxidecomputer git deps (oxidecomputer/crucible#1936)
- Add Clone and Deserialize to VolumeInfo et al (oxidecomputer/crucible#1935)
- Update omicron/oximeter (oxidecomputer/crucible#1933)
- [meta] update to drift 0.1.4 (oxidecomputer/crucible#1932)
- Don't log if there is nothing to log (oxidecomputer/crucible#1930)

Also, similar to oxidecomputer/crucible#1936, switch the omicron related
dependencies from 'branch = "main"' to an explicit rev. Previous to this
commit, _two_ old versions of omicron were being pulled in: `becbbb61`
and `b8efb9a0`. The first one is about 300 commits behind, and the
second is about 700 commits behind. With explicit git revs, the rev
being used moves to Cargo.toml, and is known without digging into the
lockfile.

Related, the tokio dep had to be further specified in order to build.

@iximeow iximeow left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nice, thanks. I saw the branch = main Omicron deps when I tried nudging Omicron last(?) week and was really surprised... good to have that fixed along the way.

@iximeow iximeow changed the title Bump crucible rev to latest, and use explicit revs Bump crucible to latest, update Omicron, use explicit revs May 14, 2026
@iximeow

iximeow commented May 14, 2026

Copy link
Copy Markdown
Member

(editorialized the title a bit for the future Omicron and if-anyone-skims-landed-PRs purposes)

@jmpesp jmpesp merged commit 58ab73b into master May 14, 2026
14 checks passed
@jmpesp jmpesp deleted the bump_crucible_and_explicit_rev branch May 14, 2026 16:39
jmpesp added a commit to oxidecomputer/omicron that referenced this pull request May 26, 2026
Update Crucible from `7103cd3a` to `bd9a0e2a`, picking up the following
PRs:

- Use an explicit rev for oxidecomputer git deps
(oxidecomputer/crucible#1936)
- Add Clone and Deserialize to VolumeInfo et al
(oxidecomputer/crucible#1935)
- Update omicron/oximeter (oxidecomputer/crucible#1933)
- [meta] update to drift 0.1.4 (oxidecomputer/crucible#1932)
- Don't log if there is nothing to log (oxidecomputer/crucible#1930)
- Add VolumeInfo (oxidecomputer/crucible#1928)
- Remove bonus Volume layer (oxidecomputer/crucible#1927)
- Add session and client id to panic messages
(oxidecomputer/crucible#1926)
- [crucible-agent-types] migrate to RFD 619 pattern
(oxidecomputer/crucible#1899)
- Background read-only region creation (oxidecomputer/crucible#1919)
- [crucible-downstairs-repair] switch to RFD 619 pattern
(oxidecomputer/crucible#1901)
- [crucible-pantry] switch to RFD 619 pattern
(oxidecomputer/crucible#1900)
- Use separate in-memory types (oxidecomputer/crucible#1913)
- Remove old field from dtrace action script
(oxidecomputer/crucible#1917)
- Retry data writes that return an IO error
(oxidecomputer/crucible#1915)
- Bump dropshot to 0.17.0 (oxidecomputer/crucible#1909)
- Reject snapshot requests when read-only (oxidecomputer/crucible#1914)
- update ringbuf method, fix clippy lint (oxidecomputer/crucible#1904)
- bump vergen-v9 version too (oxidecomputer/crucible#1903)
- update dropshot to 0.16.7, dropshot-api-manager to 0.5.2
(oxidecomputer/crucible#1851)
- perf-vol.d updates (oxidecomputer/crucible#1898)
- upgrade progenitor to 0.13, reqwest to 0.13
(oxidecomputer/crucible#1854)
- Remove cargo nextest from github workflow, out of space
(oxidecomputer/crucible#1846)
- Add a test for VCR serialize/deserialize (oxidecomputer/crucible#1843)

Update Propolis from `bc489ddf` to `58ab73bd`, picking up the following
PRs:

- Bump crucible to latest, update Omicron, use explicit revs
(oxidecomputer/propolis#1141)
- Add project and silo ids to VM attestation
(oxidecomputer/propolis#1114)
- Update escargot (oxidecomputer/propolis#1139)
- Prefix shebang and mark D scripts as executable
(oxidecomputer/propolis#1140)
- Fix error in propolis-server README (oxidecomputer/propolis#1138)
- [meta] update to drift 0.1.4 (oxidecomputer/propolis#1137)
- Fix Intel CPUID leaf 4 cache topology for SMT
(oxidecomputer/propolis#1002)
- support NVMe Deallocate (oxidecomputer/propolis#1105)
- viona: do not lose used/avail indices (oxidecomputer/propolis#1135)
- viona: multiqueue device should stay multiqueue across migration
(oxidecomputer/propolis#1121)
- Bump crucible rev to latest (oxidecomputer/propolis#1132)
- expand zerocopy IntoBytes/FromByes use in guest memory accesses
(oxidecomputer/propolis#1130)
- dropshot-api-manager 0.7.1 (oxidecomputer/propolis#1129)
- improve slog component setting (oxidecomputer/propolis#1124)
- wait for viona Poller to run before declaring device running
(oxidecomputer/propolis#1118)
- virtio: tolerate importing queues with adjusted size
(oxidecomputer/propolis#1117)
- Run viona unit tests in CI (oxidecomputer/propolis#1120)
- feature gate Crucible-specific boot digest code
(oxidecomputer/propolis#1119)

Also:

- ran `cargo update -p vergen`

- removed the `reqwest012` dependency

- removed `reqwest012_client` from Nexus

- ran `cargo hakari generate` and `cargo hakari manage-deps`

- replace use of `ProgenitorOperationRetry` with
`retry_operation_while_indefinitely`

- during the region replacement drive saga, consume the new `VolumeInfo`
from Propolis and use that to determine when to consider a replacement
done
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants