Skip to content
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

Jump to bottom

Create composite crucible and pantry packages #4927

Merged
merged 10 commits into from
Feb 21, 2024
Merged

Create composite crucible and pantry packages #4927

merged 10 commits into from
Feb 21, 2024

Conversation

karencfv
Copy link
Contributor

@karencfv karencfv commented Jan 30, 2024 •
edited
Loading

Create new packages for crucible and pantry to include the zone network config service.

Depends on oxidecomputer/crucible#1096.

These two PRs should be merged in coordination

Related: #1898

Crucible updates

This PR also merges a few changes from Crucible:

  • fe0c5c7 - [smf] Use new zone network config service
  • 3d48060 - (upstream/main) Move a few methods into downstairs
  • b01e15c - Remove extra clone in upstairs read
  • b4f37b4 - Make crucible-downstairs not depend on upstairs
  • 733b7f9 - Update Rust crate rusqlite to 0.31
  • 961e971 - Update Rust crate reedline to 0.29.0
  • b946a04 - Update Rust crate clap to 4.5
  • 39f1f3f - Update Rust crate indicatif to 0.17.8
  • 4ea9387 - Update progenitor to bc0bb4b
  • ace10f4 - Do not 500 on snapshot delete for deleted region
  • 4105133 - Drop jobs from Offline downstairs.
  • 43dace9 - Mutex<Work> → Work
  • a1f3207 - Added a contributing.md
  • 13b8669 - Remove ExtentFlushClose::source_downstairs
  • 9b3f366 - Remove unnecessary mutexes from Downstairs

@karencfv karencfv mentioned this pull request Feb 8, 2024
Merged
@karencfv karencfv marked this pull request as ready for review February 20, 2024 22:26
karencfv
karencfv commented Feb 20, 2024
View reviewed changes
package-manifest.toml Outdated Show resolved Hide resolved
smklein
smklein reviewed Feb 21, 2024
View reviewed changes
package-manifest.toml Outdated
# Packages not built within Omicron, but which must be imported.

# Refer to
# https://github.com/oxidecomputer/crucible/blob/main/package/README.md
# for instructions on building this manually.
[package.crucible]
service_name = "crucible"
service_name = "crucible-prebuilt"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Kinda a nitpick, we're using - here, and _ on crucible_pantry_prebuilt below -- can we pick something consistent between them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done! :)

@karencfv karencfv enabled auto-merge (squash) February 21, 2024 02:30
@karencfv karencfv merged commit e56e239 into oxidecomputer:main Feb 21, 2024
15 checks passed
@karencfv karencfv deleted the crucible-zones branch February 21, 2024 04:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smklein smklein smklein approved these changes

@leftwo leftwo Awaiting requested review from leftwo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@karencfv @smklein