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

supply real volume data to propolis #771

Merged
merged 18 commits into from
Mar 25, 2022
Merged

supply real volume data to propolis #771

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1727f5f
Supply real volume data to propolis
jmpesp Mar 18, 2022
8d38855
don't expose Generation as u64
jmpesp Mar 21, 2022
04b12c8
&str
jmpesp Mar 21, 2022
e6a7c8c
comments
jmpesp Mar 21, 2022
a2ab203
instance typo
jmpesp Mar 21, 2022
581bdee
hoist "If propolis zone" logic out of disk_set_runtime, eliminate todos
jmpesp Mar 21, 2022
e8981d5
mock up saga step for creating disks during instance create
jmpesp Mar 21, 2022
ea23469
update crucible rev
jmpesp Mar 21, 2022
44a3f3f
use internal_error for block size mismatch
jmpesp Mar 23, 2022
db55979
remove some XXX
jmpesp Mar 23, 2022
8c8324d
internal_error for serialization error
jmpesp Mar 23, 2022
ad3390b
Fix-up instance creation saga so it actually works
jmpesp Mar 24, 2022
98cf0e6
no more magic constant, use MAX_DISKS_PER_INSTANCE
jmpesp Mar 24, 2022
859d4a3
missed magic constant
jmpesp Mar 25, 2022
959d49d
return unsupported error
jmpesp Mar 25, 2022
94d3ca3
Merge remote-tracking branch 'upstream/main' into volumes
jmpesp Mar 25, 2022
003d9f0
update propolis-client so that builds work, also fix code after merge
jmpesp Mar 25, 2022
4a415f1
Merge remote-tracking branch 'upstream/main' into volumes
jmpesp Mar 25, 2022
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
232 changes: 230 additions & 2 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.

6 changes: 6 additions & 0 deletions common/src/api/external/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,12 @@ impl<T: ClientError> From<progenitor::progenitor_client::Error<T>> for Error {
}
}

impl From<serde_json::Error> for Error {
fn from(e: serde_json::Error) -> Self {
Error::internal_error(&e.to_string())
}
}

/// Like [`assert!`], except that instead of panicking, this function returns an
/// `Err(Error::InternalError)` with an appropriate message if the given
/// condition is not true.
Expand Down
3 changes: 2 additions & 1 deletion nexus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ path = "../rpaths"
anyhow = "1.0"
async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "c849b717be" }
async-trait = "0.1.51"
base64 = "0.13.0"
bb8 = "0.7.1"
cookie = "0.16"
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "3e7e49eeb88fa8ad74375b0642aabd4224b1f2cb" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945daedb88cefa790f1d994b3a038b8fa9ac514a" }
# Tracking pending 2.0 version.
diesel = { git = "https://github.com/diesel-rs/diesel", rev = "ce77c382", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
futures = "0.3.21"
Expand Down
Loading