Skip to content

Commit 222ff66

Browse files
gjcolombogjcolombo
committed
cleanup
1 parent 16ac7fd commit 222ff66

File tree

5 files changed

+33
-34
lines changed

5 files changed

+33
-34
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4118,9 +4118,9 @@ mod tests {
41184118
id: volume_id,
41194119
target: vec![
41204120
// target to replace
4121-
SocketAddr::V6(region_addresses[0].clone()),
4122-
SocketAddr::V6(region_addresses[1].clone()),
4123-
SocketAddr::V6(region_addresses[2].clone()),
4121+
SocketAddr::V6(region_addresses[0]),
4122+
SocketAddr::V6(region_addresses[1]),
4123+
SocketAddr::V6(region_addresses[2]),
41244124
],
41254125
lossy: false,
41264126
flush_timeout: None,
@@ -4238,9 +4238,9 @@ mod tests {
42384238
opts: CrucibleOpts {
42394239
id: volume_id,
42404240
target: vec![
4241-
SocketAddr::V6(region_addresses[0].clone()), // back to what it was
4242-
SocketAddr::V6(region_addresses[1].clone()),
4243-
SocketAddr::V6(region_addresses[2].clone()),
4241+
SocketAddr::V6(region_addresses[0]), // back to what it was
4242+
SocketAddr::V6(region_addresses[1]),
4243+
SocketAddr::V6(region_addresses[2]),
42444244
],
42454245
lossy: false,
42464246
flush_timeout: None,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ async fn ssc_start_running_snapshot(
14541454
));
14551455

14561456
info!(log, "map {} to {}", region_addr, snapshot_addr);
1457-
map.insert(region_addr, snapshot_addr.clone());
1457+
map.insert(region_addr, snapshot_addr);
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: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2284,9 +2284,9 @@ async fn test_keep_your_targets_straight(cptestctx: &ControlPlaneTestContext) {
22842284
opts: CrucibleOpts {
22852285
id: Uuid::new_v4(),
22862286
target: vec![
2287-
region_snapshots[0].3.clone(),
2288-
region_snapshots[1].3.clone(),
2289-
region_snapshots[2].3.clone(),
2287+
region_snapshots[0].3,
2288+
region_snapshots[1].3,
2289+
region_snapshots[2].3,
22902290
],
22912291
lossy: false,
22922292
flush_timeout: None,
@@ -2405,9 +2405,9 @@ async fn test_keep_your_targets_straight(cptestctx: &ControlPlaneTestContext) {
24052405
opts: CrucibleOpts {
24062406
id: Uuid::new_v4(),
24072407
target: vec![
2408-
region_snapshots[3].3.clone(),
2409-
region_snapshots[4].3.clone(),
2410-
region_snapshots[5].3.clone(),
2408+
region_snapshots[3].3,
2409+
region_snapshots[4].3,
2410+
region_snapshots[5].3,
24112411
],
24122412
lossy: false,
24132413
flush_timeout: None,
@@ -3567,7 +3567,7 @@ struct TestReadOnlyRegionReferenceUsage {
35673567
datastore: Arc<DataStore>,
35683568

35693569
region: db::model::Region,
3570-
region_address: SocketAddrV6,
3570+
region_address: SocketAddr,
35713571

35723572
first_volume_id: Uuid,
35733573
second_volume_id: Uuid,
@@ -3628,8 +3628,9 @@ impl TestReadOnlyRegionReferenceUsage {
36283628
// so fill in a random port here.
36293629
datastore.region_set_port(region.id(), 12345).await.unwrap();
36303630

3631-
let region_address =
3632-
datastore.region_addr(region.id()).await.unwrap().unwrap();
3631+
let region_address = SocketAddr::V6(
3632+
datastore.region_addr(region.id()).await.unwrap().unwrap(),
3633+
);
36333634

36343635
let region = datastore.get_region(region.id()).await.unwrap();
36353636

@@ -3660,7 +3661,7 @@ impl TestReadOnlyRegionReferenceUsage {
36603661
gen: 1,
36613662
opts: CrucibleOpts {
36623663
id: Uuid::new_v4(),
3663-
target: vec![SocketAddr::V6(self.region_address)],
3664+
target: vec![self.region_address],
36643665
lossy: false,
36653666
flush_timeout: None,
36663667
key: None,
@@ -3789,9 +3790,7 @@ impl TestReadOnlyRegionReferenceUsage {
37893790
gen: 1,
37903791
opts: CrucibleOpts {
37913792
id: Uuid::new_v4(),
3792-
target: vec![SocketAddr::V6(
3793-
self.region_address,
3794-
)],
3793+
target: vec![self.region_address],
37953794
lossy: false,
37963795
flush_timeout: None,
37973796
key: None,
@@ -3824,7 +3823,7 @@ impl TestReadOnlyRegionReferenceUsage {
38243823
gen: 1,
38253824
opts: CrucibleOpts {
38263825
id: Uuid::new_v4(),
3827-
target: vec![SocketAddr::V6(self.region_address)],
3826+
target: vec![self.region_address],
38283827
lossy: false,
38293828
flush_timeout: None,
38303829
key: None,
@@ -3859,7 +3858,7 @@ impl TestReadOnlyRegionReferenceUsage {
38593858
gen: 1,
38603859
opts: CrucibleOpts {
38613860
id: Uuid::new_v4(),
3862-
target: vec![SocketAddr::V6(self.region_address)],
3861+
target: vec![self.region_address],
38633862
lossy: false,
38643863
flush_timeout: None,
38653864
key: None,
@@ -5481,9 +5480,9 @@ async fn test_migrate_to_ref_count_with_records_region_snapshot_deleting(
54815480
opts: CrucibleOpts {
54825481
id: Uuid::new_v4(),
54835482
target: vec![
5484-
region_snapshots[1].3.clone(),
5485-
region_snapshots[2].3.clone(),
5486-
region_snapshots[3].3.clone(),
5483+
region_snapshots[1].3,
5484+
region_snapshots[2].3,
5485+
region_snapshots[3].3,
54875486
],
54885487
lossy: false,
54895488
flush_timeout: None,
@@ -5521,8 +5520,10 @@ async fn test_migrate_to_ref_count_with_records_region_snapshot_deleting(
55215520
);
55225521
assert_eq!(region_snapshot_to_delete.region_id, region_snapshots[0].1);
55235522
assert_eq!(region_snapshot_to_delete.snapshot_id, region_snapshots[0].2);
5524-
assert_eq!(region_snapshot_to_delete.snapshot_addr.parse::<SocketAddr>().unwrap(),
5525-
region_snapshots[0].3);
5523+
assert_eq!(
5524+
region_snapshot_to_delete.snapshot_addr.parse::<SocketAddr>().unwrap(),
5525+
region_snapshots[0].3
5526+
);
55265527
assert_eq!(region_snapshot_to_delete.volume_references, 0);
55275528
assert_eq!(region_snapshot_to_delete.deleting, true);
55285529

‎sled-agent/src/instance.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,8 +1001,6 @@ impl InstanceRunner {
10011001
format!("{id}:device")
10021002
}
10031003

1004-
// The basic spec enables COM1-COM4 by default. Everything else
1005-
// needs to be added manually.
10061004
let mut spec = propolis_client::types::InstanceSpecV0 {
10071005
board: Board {
10081006
chipset: Chipset::default(),

‎sled-agent/src/sim/sled_agent.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ use omicron_uuid_kinds::{
4444
SupportBundleUuid, ZpoolUuid,
4545
};
4646
use oxnet::Ipv6Net;
47-
use propolis_client::types::{
48-
Board, Chipset, ComponentV0, SerialPort, SerialPortNumber,
49-
};
5047
use propolis_client::{
51-
types::{InstanceInitializationMethod, InstanceSpecV0},
48+
types::{
49+
Board, Chipset, ComponentV0, InstanceInitializationMethod,
50+
InstanceSpecV0, SerialPort, SerialPortNumber,
51+
},
5252
Client as PropolisClient, VolumeConstructionRequest,
5353
};
5454
use sled_agent_api::SupportBundleMetadata;
@@ -129,7 +129,7 @@ fn extract_targets_from_volume_construction_request(
129129

130130
VolumeConstructionRequest::Region { opts, .. } => {
131131
for target in &opts.target {
132-
res.push(target.clone());
132+
res.push(*target);
133133
}
134134
}
135135

0 commit comments

Comments
 (0)