Skip to content

Commit ee3c785

Browse files
gjcolombogjcolombo
committed
use SocketAddrV6::into::<SocketAddr>
1 parent 4292e00 commit ee3c785

File tree

4 files changed

+50
-50
lines changed

4 files changed

+50
-50
lines changed

‎nexus/db-queries/src/db/datastore/volume.rs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3181,7 +3181,7 @@ impl DataStore {
31813181
gen: 1,
31823182
opts: sled_agent_client::CrucibleOpts {
31833183
id: volume_to_delete_id.0,
3184-
target: vec![std::net::SocketAddr::V6(existing.0)],
3184+
target: vec![existing.0.into()],
31853185
lossy: false,
31863186
flush_timeout: None,
31873187
key: None,
@@ -4216,9 +4216,9 @@ mod tests {
42164216
id: volume_id,
42174217
target: vec![
42184218
// target to replace
4219-
SocketAddr::V6(region_addresses[0]),
4220-
SocketAddr::V6(region_addresses[1]),
4221-
SocketAddr::V6(region_addresses[2]),
4219+
region_addresses[0].into(),
4220+
region_addresses[1].into(),
4221+
region_addresses[2].into(),
42224222
],
42234223
lossy: false,
42244224
flush_timeout: None,
@@ -4278,9 +4278,9 @@ mod tests {
42784278
opts: CrucibleOpts {
42794279
id: volume_id,
42804280
target: vec![
4281-
SocketAddr::V6(replacement_region_addr), // replaced
4282-
SocketAddr::V6(region_addresses[1]),
4283-
SocketAddr::V6(region_addresses[2]),
4281+
replacement_region_addr.into(), // replaced
4282+
region_addresses[1].into(),
4283+
region_addresses[2].into(),
42844284
],
42854285
lossy: false,
42864286
flush_timeout: None,
@@ -4336,9 +4336,9 @@ mod tests {
43364336
opts: CrucibleOpts {
43374337
id: volume_id,
43384338
target: vec![
4339-
SocketAddr::V6(region_addresses[0]), // back to what it was
4340-
SocketAddr::V6(region_addresses[1]),
4341-
SocketAddr::V6(region_addresses[2]),
4339+
region_addresses[0].into(), // back to what it was
4340+
region_addresses[1].into(),
4341+
region_addresses[2].into(),
43424342
],
43434343
lossy: false,
43444344
flush_timeout: None,
@@ -4503,9 +4503,9 @@ mod tests {
45034503
opts: CrucibleOpts {
45044504
id: volume_id,
45054505
target: vec![
4506-
SocketAddr::V6(region_addresses[0]),
4507-
SocketAddr::V6(region_addresses[1]),
4508-
SocketAddr::V6(region_addresses[2]),
4506+
region_addresses[0].into(),
4507+
region_addresses[1].into(),
4508+
region_addresses[2].into(),
45094509
],
45104510
lossy: false,
45114511
flush_timeout: None,
@@ -4527,9 +4527,9 @@ mod tests {
45274527
id: rop_id,
45284528
target: vec![
45294529
// target to replace
4530-
SocketAddr::V6(address_1),
4531-
SocketAddr::V6(address_2),
4532-
SocketAddr::V6(address_3),
4530+
address_1.into(),
4531+
address_2.into(),
4532+
address_3.into(),
45334533
],
45344534
lossy: false,
45354535
flush_timeout: None,
@@ -4626,9 +4626,9 @@ mod tests {
46264626
opts: CrucibleOpts {
46274627
id: volume_id,
46284628
target: vec![
4629-
SocketAddr::V6(region_addresses[0]),
4630-
SocketAddr::V6(region_addresses[1]),
4631-
SocketAddr::V6(region_addresses[2]),
4629+
region_addresses[0].into(),
4630+
region_addresses[1].into(),
4631+
region_addresses[2].into(),
46324632
],
46334633
lossy: false,
46344634
flush_timeout: None,
@@ -4650,9 +4650,9 @@ mod tests {
46504650
id: rop_id,
46514651
target: vec![
46524652
// target replaced
4653-
SocketAddr::V6(replacement_region_addr),
4654-
SocketAddr::V6(address_2),
4655-
SocketAddr::V6(address_3),
4653+
replacement_region_addr.into(),
4654+
address_2.into(),
4655+
address_3.into(),
46564656
],
46574657
lossy: false,
46584658
flush_timeout: None,
@@ -4692,7 +4692,7 @@ mod tests {
46924692
id: volume_to_delete_id,
46934693
target: vec![
46944694
// replaced target stashed here
4695-
SocketAddr::V6(address_1),
4695+
address_1.into(),
46964696
],
46974697
lossy: false,
46984698
flush_timeout: None,
@@ -4782,9 +4782,9 @@ mod tests {
47824782
opts: CrucibleOpts {
47834783
id: volume_id,
47844784
target: vec![
4785-
SocketAddr::V6(region_addresses[0]),
4786-
SocketAddr::V6(region_addresses[1]),
4787-
SocketAddr::V6(region_addresses[2]),
4785+
region_addresses[0].into(),
4786+
region_addresses[1].into(),
4787+
region_addresses[2].into(),
47884788
],
47894789
lossy: false,
47904790
flush_timeout: None,
@@ -4806,9 +4806,9 @@ mod tests {
48064806
id: rop_id,
48074807
target: vec![
48084808
// back to what it was
4809-
SocketAddr::V6(address_1),
4810-
SocketAddr::V6(address_2),
4811-
SocketAddr::V6(address_3),
4809+
address_1.into(),
4810+
address_2.into(),
4811+
address_3.into(),
48124812
],
48134813
lossy: false,
48144814
flush_timeout: None,
@@ -4848,7 +4848,7 @@ mod tests {
48484848
id: volume_to_delete_id,
48494849
target: vec![
48504850
// replacement stashed here
4851-
SocketAddr::V6(replacement_region_addr),
4851+
replacement_region_addr.into(),
48524852
],
48534853
lossy: false,
48544854
flush_timeout: None,
@@ -4964,9 +4964,9 @@ mod tests {
49644964
opts: CrucibleOpts {
49654965
id: Uuid::new_v4(),
49664966
target: vec![
4967-
SocketAddr::V6(address_1),
4968-
SocketAddr::V6(address_2),
4969-
SocketAddr::V6(address_3),
4967+
address_1.into(),
4968+
address_2.into(),
4969+
address_3.into(),
49704970
],
49714971
lossy: false,
49724972
flush_timeout: None,
@@ -4988,7 +4988,7 @@ mod tests {
49884988
let volumes = datastore
49894989
.find_volumes_referencing_socket_addr(
49904990
&opctx,
4991-
SocketAddr::V6(address_1),
4991+
address_1.into(),
49924992
)
49934993
.await
49944994
.unwrap();
@@ -5191,7 +5191,7 @@ mod tests {
51915191
id: volume_id,
51925192
target: vec![
51935193
"[fd00:1122:3344:104::1]:400".parse().unwrap(),
5194-
SocketAddr::V6(new_target.0),
5194+
new_target.0.into(),
51955195
"[fd00:1122:3344:106::1]:402".parse().unwrap(),
51965196
],
51975197
lossy: false,
@@ -5345,7 +5345,7 @@ mod tests {
53455345
"[fd33:1122:3344:305::1]:2001"
53465346
.parse()
53475347
.unwrap(),
5348-
SocketAddr::V6(new_target.0),
5348+
new_target.0.into(),
53495349
],
53505350
lossy: false,
53515351
flush_timeout: None,
@@ -5465,7 +5465,7 @@ mod tests {
54655465
opts: CrucibleOpts {
54665466
id: volume_id,
54675467
target: vec![
5468-
SocketAddr::V6(new_target.0),
5468+
new_target.0.into(),
54695469
"[fd33:1122:3344:305::1]:2001".parse().unwrap(),
54705470
"[fd33:1122:3344:306::1]:2002".parse().unwrap(),
54715471
],

‎nexus/src/app/sagas/region_replacement_start.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ use serde::Deserialize;
6060
use serde::Serialize;
6161
use sled_agent_client::CrucibleOpts;
6262
use sled_agent_client::VolumeConstructionRequest;
63-
use std::net::{SocketAddr, SocketAddrV6};
63+
use std::net::SocketAddrV6;
6464
use steno::ActionError;
6565
use steno::Node;
6666
use uuid::Uuid;
@@ -688,7 +688,7 @@ async fn srrs_create_fake_volume(
688688
gen: 0,
689689
opts: CrucibleOpts {
690690
id: new_volume_id,
691-
target: vec![SocketAddr::V6(old_region_address)],
691+
target: vec![old_region_address.into()],
692692
lossy: false,
693693
flush_timeout: None,
694694
key: None,

‎nexus/src/app/sagas/snapshot_create.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,22 +1439,22 @@ async fn ssc_start_running_snapshot(
14391439
);
14401440

14411441
// Map from the region to the snapshot
1442-
let region_addr = SocketAddr::V6(SocketAddrV6::new(
1442+
let region_addr = SocketAddrV6::new(
14431443
*dataset_addr.ip(),
14441444
crucible_region.port_number,
14451445
0,
14461446
0,
1447-
));
1447+
);
14481448

1449-
let snapshot_addr = SocketAddr::V6(SocketAddrV6::new(
1449+
let snapshot_addr = SocketAddrV6::new(
14501450
*dataset_addr.ip(),
14511451
crucible_running_snapshot.port_number,
14521452
0,
14531453
0,
1454-
));
1454+
);
14551455

14561456
info!(log, "map {} to {}", region_addr, snapshot_addr);
1457-
map.insert(region_addr, snapshot_addr);
1457+
map.insert(region_addr.into(), snapshot_addr.into());
14581458

14591459
// Once snapshot has been validated, and running snapshot has been
14601460
// started, add an entry in the region_snapshot table to correspond to

‎nexus/tests/integration_tests/volume_management.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6055,9 +6055,9 @@ async fn test_no_zombie_read_only_regions(cptestctx: &ControlPlaneTestContext) {
60556055
opts: CrucibleOpts {
60566056
id: Uuid::new_v4(),
60576057
target: vec![
6058-
SocketAddr::V6(region_addrs[0]),
6059-
SocketAddr::V6(region_addrs[1]),
6060-
SocketAddr::V6(region_addrs[2]),
6058+
region_addrs[0].into(),
6059+
region_addrs[1].into(),
6060+
region_addrs[2].into(),
60616061
],
60626062
lossy: false,
60636063
flush_timeout: None,
@@ -6241,9 +6241,9 @@ async fn test_no_zombie_read_write_regions(
62416241
opts: CrucibleOpts {
62426242
id: Uuid::new_v4(),
62436243
target: vec![
6244-
SocketAddr::V6(region_addrs[0]),
6245-
SocketAddr::V6(region_addrs[1]),
6246-
SocketAddr::V6(region_addrs[2]),
6244+
region_addrs[0].into(),
6245+
region_addrs[1].into(),
6246+
region_addrs[2].into(),
62476247
],
62486248
lossy: false,
62496249
flush_timeout: None,

0 commit comments

Comments
 (0)