Add checked IPv6 address database types #928
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Adds the `ipv6` module to Nexus, which exposes a type that is guaranteed to be IPv6, but serialized to / from the database as a generic `IpNetwork` type. - Moves the `db::model::Sled` type to use the new IPv6 type support - Uses `Ipv6Addr` and `SocketAddrV6` in all APIs related to the sled itself, including registering and getting the adddresses through the API
bnaecker
changed the title
luqmana
reviewed
Apr 19, 2022
luqmana
approved these changes
Apr 19, 2022
|
Thanks for the review @luqmana! Yes, I can drop that TODO. And yes, this was the first step in a bunch of work to support explicit IPv6 addresses. I made sure the DB type worked for the sled model, and then I can split up converting the rest of the models (and the rest of the sled agent itself) into small PRs. |
davepacheco
approved these changes
Apr 19, 2022
| use std::str::FromStr; | ||
| use uuid::Uuid; | ||
|
|
||
| /// Sent by a sled agent on startup to Nexus to request further instruction | ||
| #[derive(Serialize, Deserialize, JsonSchema)] | ||
| pub struct SledAgentStartupInfo { | ||
| /// the address of the sled agent's API endpoint | ||
| pub sa_address: SocketAddr, | ||
| pub sa_address: SocketAddrV6, |
There was a problem hiding this comment.
One thing I don't quite understand: I expected this to trigger a change to the generated OpenAPI spec, and a corresponding change in the sled agents (simulated and real) to use a v6 address. But it looks like the generated type for this represents this field with a string:
omicron/sled-agent/src/sim/server.rs
Line 76 in b7f7ea6
so the distinction between v4+v6 and v6-only is not there. I gather that's because json-schema says the schema for an IP address is just a string:
https://docs.rs/schemars/latest/src/schemars/json_schema_impls/primitives.rs.html#54
Kind of a bummer...but well beyond the scope of this PR.
There was a problem hiding this comment.
Yeah it's definitely a bummer. It seems that a large number of types in the generated clients are serialized as a string, and require that explicit .to_string() call. I'm not sure why, since it seems like the serialization should happen after the type is constructed. But yeah, beyond the scope of this PR. Is there an issue or something you'd like me to create for this?
There was a problem hiding this comment.
I don't think so. Thanks.
leftwo
pushed a commit
that referenced
this pull request
Oct 4, 2023
Crucible updates
all Crucible connections should set TCP_NODELAY (#983)
Use a fixed size for tag and nonce (#957)
Log crucible opts on start, order crutest options (#974)
Lock the Downstairs less (#966)
Cache dirty flag locally, reducing SQLite operations (#970)
Make stats mutex synchronous (#961)
Optimize requeue during flow control conditions (#962)
Update Rust crate base64 to 0.21.4 (#950)
Do less in control (#949)
Fix --flush-per-blocks (#959)
Fast dependency checking (#916)
Update actions/checkout action to v4 (#960)
Use `cargo hakari` for better workspace deps (#956)
Update actions/checkout digest to 8ade135 (#939)
Cache block size in Guest (#947)
Update Rust crate ringbuffer to 0.15.0 (#954)
Update Rust crate toml to 0.8 (#955)
Update Rust crate reedline to 0.24.0 (#953)
Update Rust crate libc to 0.2.148 (#952)
Update Rust crate indicatif to 0.17.7 (#951)
Remove unused async (#943)
Use a synchronous mutex for bw/iop_tokens (#946)
Make flush ID non-locking (#945)
Use `oneshot` channels instead of `mpsc` for notification (#918)
Use a strong type for upstairs negotiation (#941)
Add a "dynamometer" option to crucible-downstairs (#931)
Get new work and active count in one lock (#938)
A bunch of misc test cleanup stuff (#937)
Wait for a snapshot to finish on all downstairs (#920)
dsc and clippy cleanup. (#935)
No need to sort ackable_work (#934)
Use a strong type for repair ID (#928)
Keep new jobs sorted (#929)
Remove state_count function on Downstairs (#927)
Small cleanup to IOStateCount (#932)
let cmon and IOStateCount use ClientId (#930)
Fast return for zero length IOs (#926)
Use a strong type for client ID (#925)
A few Crucible Agent fixes (#922)
Use a newtype for `JobId` (#919)
Don't pass MutexGuard into functions (#917)
Crutest updates, rename tests, new options (#911)
Propolis updates
Update tungstenite crates to 0.20
Use `strum` crate for enum-related utilities
Wire up bits for CPUID customization
PHD: improve artifact store (#529)
Revert abort-on-panic in 'dev' cargo profile
leftwo
added a commit
that referenced
this pull request
Oct 5, 2023
Crucible updates
all Crucible connections should set TCP_NODELAY (#983)
Use a fixed size for tag and nonce (#957)
Log crucible opts on start, order crutest options (#974)
Lock the Downstairs less (#966)
Cache dirty flag locally, reducing SQLite operations (#970)
Make stats mutex synchronous (#961)
Optimize requeue during flow control conditions (#962)
Update Rust crate base64 to 0.21.4 (#950)
Do less in control (#949)
Fix --flush-per-blocks (#959)
Fast dependency checking (#916)
Update actions/checkout action to v4 (#960)
Use `cargo hakari` for better workspace deps (#956)
Update actions/checkout digest to 8ade135 (#939)
Cache block size in Guest (#947)
Update Rust crate ringbuffer to 0.15.0 (#954)
Update Rust crate toml to 0.8 (#955)
Update Rust crate reedline to 0.24.0 (#953)
Update Rust crate libc to 0.2.148 (#952)
Update Rust crate indicatif to 0.17.7 (#951)
Remove unused async (#943)
Use a synchronous mutex for bw/iop_tokens (#946)
Make flush ID non-locking (#945)
Use `oneshot` channels instead of `mpsc` for notification (#918)
Use a strong type for upstairs negotiation (#941)
Add a "dynamometer" option to crucible-downstairs (#931)
Get new work and active count in one lock (#938)
A bunch of misc test cleanup stuff (#937)
Wait for a snapshot to finish on all downstairs (#920)
dsc and clippy cleanup. (#935)
No need to sort ackable_work (#934)
Use a strong type for repair ID (#928)
Keep new jobs sorted (#929)
Remove state_count function on Downstairs (#927)
Small cleanup to IOStateCount (#932)
let cmon and IOStateCount use ClientId (#930)
Fast return for zero length IOs (#926)
Use a strong type for client ID (#925)
A few Crucible Agent fixes (#922)
Use a newtype for `JobId` (#919)
Don't pass MutexGuard into functions (#917)
Crutest updates, rename tests, new options (#911)
Propolis updates
Update tungstenite crates to 0.20
Use `strum` crate for enum-related utilities
Wire up bits for CPUID customization
PHD: improve artifact store (#529)
Revert abort-on-panic in 'dev' cargo profile
---------
Co-authored-by: Alan Hanson <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ipv6module to Nexus, which exposes a type that isguaranteed to be IPv6, but serialized to / from the database as a
generic
IpNetworktype.db::model::Sledtype to use the new IPv6 type supportIpv6AddrandSocketAddrV6in all APIs related to the sleditself, including registering and getting the adddresses through the
API