Skip to content

Remove bonus Volume layer#1927

Merged
jmpesp merged 2 commits into
oxidecomputer:mainfrom
jmpesp:no_double_voluming
Apr 22, 2026
Merged

Remove bonus Volume layer#1927
jmpesp merged 2 commits into
oxidecomputer:mainfrom
jmpesp:no_double_voluming

Conversation

@jmpesp
Copy link
Copy Markdown
Contributor

@jmpesp jmpesp commented Apr 21, 2026

Volume::construct was unintentionally adding another layer of Volume when constructing from a request. Remove this, ensuring that what is constructed matches the request.

`Volume::construct` was unintentionally adding another layer of Volume
when constructing from a request. Remove this, ensuring that what is
constructed matches the request.
@jmpesp jmpesp requested review from leftwo and mkeeter April 21, 2026 16:53
Copy link
Copy Markdown
Contributor

@leftwo leftwo left a comment

Choose a reason for hiding this comment

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

I assume (as tests pass) that the volume replacement stuff can still handle and we did not accidentally require multiple volume layers to make things work?

Also, this should not impact what Omicron has in the json blob for a VCR, right?

@jmpesp
Copy link
Copy Markdown
Contributor Author

jmpesp commented Apr 21, 2026

I assume (as tests pass) that the volume replacement stuff can still handle and we did not accidentally require multiple volume layers to make things work?

If anything it's a testament to our code quality that the replacement code worked before and after this change :) I have the same fear here too, but will also trust the tests here.

Also, this should not impact what Omicron has in the json blob for a VCR, right?

I also had this same fear, but no: the request that's stored in the database doesn't change or need to change here. It's Volume::construct's interpretation of the request that is changing.

Comment thread upstairs/src/volume.rs
}
}

fn to_arc_block_io<T>(b: T) -> Arc<dyn BlockIO + Send + Sync>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm mad that this is necessary (and that we can't use Arc::new or .from() directly), but haven't found a way to avoid it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

😢

Comment thread upstairs/src/guest.rs Outdated
(guest, io)
}

pub async fn create_and_up_main(
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This function doesn't need async (clippy complains in my editor, dunno why it passes in CI)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

thanks, did that in ae5f3ee

@jmpesp
Copy link
Copy Markdown
Contributor Author

jmpesp commented Apr 22, 2026

I spun up the Canada region and performed a bunch of replacements, so we're good here. Going to merge!

@jmpesp jmpesp merged commit 784aeb7 into oxidecomputer:main Apr 22, 2026
17 checks passed
@jmpesp jmpesp deleted the no_double_voluming branch April 22, 2026 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants