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

Store StaticHeader::pool_uuid and StaticHeader::dev_uuid into a new StratisIdentifiers type #1826

Merged
merged 1 commit into from
Feb 20, 2020
Merged

Store StaticHeader::pool_uuid and StaticHeader::dev_uuid into a new StratisIdentifiers type #1826

merged 1 commit into from
Feb 20, 2020

Conversation

GuillaumeGomez
Copy link
Contributor

Fixes #1794.

@stratis-bot
Copy link

Test with Jenkins?

2 similar comments
@stratis-bot
Copy link

Test with Jenkins?

@stratis-bot
Copy link

Test with Jenkins?

@mulkieran
Copy link
Member

ok to test

mulkieran
mulkieran requested changes Feb 18, 2020
View reviewed changes
Copy link
Member

@mulkieran mulkieran left a comment

Choose a reason for hiding this comment

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

Just four spots to be fixed, otherwise looks just right.

src/engine/strat_engine/backstore/metadata/static_header.rs Outdated
@@ -554,8 +584,8 @@ pub mod tests {
fn static_header(ref sh1 in static_header_strategy()) {
let buf = sh1.sigblock_to_buf();
let sh2 = StaticHeader::sigblock_from_buf(&buf).unwrap().unwrap();
prop_assert_eq!(sh1.pool_uuid, sh2.pool_uuid);
prop_assert_eq!(sh1.dev_uuid, sh2.dev_uuid);
prop_assert_eq!(sh1.identifiers.pool_uuid, sh2.identifiers.pool_uuid);
Copy link
Member

Choose a reason for hiding this comment

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

Might as well just use one equality check on the identifiers, since they implement Eq.

src/engine/strat_engine/backstore/metadata/static_header.rs Outdated
);
let sh_newer =
StaticHeader::new(sh.identifiers.clone(), sh.mda_size, sh.blkdev_size, ts + 1);
Copy link
Member

Choose a reason for hiding this comment

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

You can drop the clone here.

src/engine/strat_engine/backstore/metadata/static_header.rs Outdated
@@ -431,7 +462,7 @@ pub mod tests {

prop_assert!(StaticHeader::setup(&mut buf)
.unwrap()
.map(|new_sh| new_sh.pool_uuid == sh.pool_uuid && new_sh.dev_uuid == sh.dev_uuid)
.map(|new_sh| new_sh.identifiers.pool_uuid == sh.identifiers.pool_uuid && new_sh.identifiers.device_uuid == sh.identifiers.device_uuid)
Copy link
Member

Choose a reason for hiding this comment

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

You can just check equality of identifiers here.

src/engine/strat_engine/backstore/metadata/static_header.rs Outdated
where
F: Read + Seek + SyncAll,
{
StaticHeader::setup(f).map(|sh| sh.map(|sh| (sh.pool_uuid, sh.dev_uuid)))
StaticHeader::setup(f).map(|sh| sh.map(|sh| sh.identifiers.clone()))
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't be necessary to clone here.

@GuillaumeGomez
Copy link
Contributor Author

Updated and rebased.

mulkieran
mulkieran requested changes Feb 19, 2020
View reviewed changes
Copy link
Member

@mulkieran mulkieran left a comment

Choose a reason for hiding this comment

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

A few more places where you can take advantage of the fact that StratisIdentifiers is copy.

src/engine/strat_engine/backstore/metadata/static_header.rs Outdated
sh.pool_uuid,
sh.dev_uuid,
let sh_older = StaticHeader::new(
StratisIdentifiers::new(sh.identifiers.pool_uuid, sh.identifiers.device_uuid),
Copy link
Member

Choose a reason for hiding this comment

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

Here, you can just use sh.identifiers like you do with the definition of sh_newer below.

src/engine/strat_engine/backstore/metadata/static_header.rs Outdated
);
let sh_newer =
Copy link
Member

Choose a reason for hiding this comment

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

rustfmt 1.40 would like this assignment to be all on one line.

src/engine/strat_engine/backstore/metadata/bda.rs Outdated
@@ -184,8 +180,7 @@ mod tests {
let mut buf = Cursor::new(vec![0; *sh.blkdev_size.sectors().bytes() as usize]);
let mut bda = BDA::initialize(
&mut buf,
sh.pool_uuid,
sh.dev_uuid,
StratisIdentifiers::new(sh.identifiers.pool_uuid, sh.identifiers.device_uuid),
Copy link
Member

Choose a reason for hiding this comment

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

Just use sh.identifiers here, just like above.

src/engine/strat_engine/backstore/metadata/bda.rs Outdated
@@ -229,8 +224,7 @@ mod tests {
let mut buf = Cursor::new(vec![0; buf_size]);
let mut bda = BDA::initialize(
&mut buf,
sh.pool_uuid,
sh.dev_uuid,
StratisIdentifiers::new(sh.identifiers.pool_uuid, sh.identifiers.device_uuid),
Copy link
Member

Choose a reason for hiding this comment

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

Just use sh.identiifers here, too.

@GuillaumeGomez
Copy link
Contributor Author

I'm relying on the CI here, sorry. ^^'

Updated otherwise!

mulkieran
mulkieran requested changes Feb 20, 2020
View reviewed changes
Copy link
Member

@mulkieran mulkieran left a comment

Choose a reason for hiding this comment

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

It looks good! Please fix the format error and we can put it up for final review.

@GuillaumeGomez
Copy link
Contributor Author

Format, my arch enemy! Updated haha.

mulkieran
mulkieran approved these changes Feb 20, 2020
View reviewed changes
Copy link
Member

@mulkieran mulkieran left a comment

Choose a reason for hiding this comment

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

Looks good.

@mulkieran mulkieran merged commit 845e506 into stratis-storage:develop-2.0.1 Feb 20, 2020
@GuillaumeGomez GuillaumeGomez deleted the device-identifiers branch February 21, 2020 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mulkieran mulkieran mulkieran approved these changes

@jbaublitz jbaublitz jbaublitz approved these changes

@bgurney-rh bgurney-rh bgurney-rh approved these changes

@drckeefe drckeefe drckeefe approved these changes

@lleshchi lleshchi lleshchi approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Have device_identifiers() return a struct instead of a tuple
7 participants
@GuillaumeGomez @stratis-bot @mulkieran @jbaublitz @bgurney-rh @drckeefe @lleshchi