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.

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

Reverts root disk device non-empty pool check #6153

Merged
merged 3 commits into from Sep 5, 2019

Conversation

@tomponline
Copy link
Member

commented Sep 5, 2019

The recent modification to IsRootDiskDevice to correctly verify for a non-empty pool property has caused issues with the migration process from older server versions that don't have storage pool support, and will also cause problems when using the client against older version versions.

As such this change has been reverted and the non-empty pool property check moved into the disk device validation itself.

A comment has been added to avoid confusion in the future.

Part of #5819

@stgraber

This comment has been minimized.

Copy link
Member

commented Sep 5, 2019

@tomponline you revert commit isn't signed-off

@stgraber

This comment has been minimized.

Copy link
Member

commented Sep 5, 2019

Otherwise looks good, will merge once that's fixed

@tomponline

This comment has been minimized.

Copy link
Member Author

commented Sep 5, 2019

@stgraber ah ok wasnt sure if I needed to do that will do it now.

tomponline added 3 commits Sep 5, 2019
Revert "shared/container: Updates IsRootDiskDevice to use same defini…
…tion of rootfs as container_lxc"

This reverts commit b1842a9.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
shared/container: Improves comments on IsRootDiskDevice
Adds comment specifically about not validating non-empty pool property on root disk devices.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
device/disk: Adds validation for root disk having a pool property
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>

@tomponline tomponline force-pushed the tomponline:tp-device-disk-root branch from a0b46ac to e2c559a Sep 5, 2019

@tomponline

This comment has been minimized.

Copy link
Member Author

commented Sep 5, 2019

@stgraber thats done now.

@stgraber stgraber merged commit c51565d into lxc:master Sep 5, 2019

4 of 5 checks passed

Testsuite Test pending
Details
Branch target Branch target is correct
Details
DCO All commits signed-off
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@tomponline tomponline deleted the tomponline:tp-device-disk-root branch Sep 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
You can’t perform that action at this time.