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

Backports (stable-5.0) #13215

Merged
merged 119 commits into from Mar 26, 2024
Merged

Backports (stable-5.0) #13215

merged 119 commits into from Mar 26, 2024

Conversation

tomponline
Copy link
Member

@tomponline tomponline commented Mar 26, 2024

I have backported the structural changes related to storage volume volatile.uuid and then removed the actual volatile.uuid implementation parts as we dont want to add that in LXD 5.0.x.

The aim is to keep the storage subsystem mostly in sync with main so as to aid backporting storage fixes.

gabrielmougard and others added 30 commits March 22, 2024 16:02
…orage is enabled for an instance

Signed-off-by: Gabriel Mougard <gabriel.mougard@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
This is a false positive.

Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
This allows passing down VolumeCopy structs and Volume structs for snapshots into the storage driver.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
This must have been missed when we made improvements to OIDC
security recently.

Signed-off-by: Mark Laing <mark.laing@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Non-native binaries cannot be strip'ed:

$ strip -s bin/lxc.* bin/lxd-migrate.*
strip: Unable to recognise the format of the input file `bin/lxc.aarch64'
strip: Unable to recognise the format of the input file `bin/lxd-migrate.aarch64'

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Call the respective storage driver functions with VolumeCopy instead of Volume.
This allows passing down snapshot related information into the storage driver.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
simondeziel and others added 23 commits March 26, 2024 12:28
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
…GetNetworkWithInterface

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
…ettings

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
…Backup

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
… error in NewDeviceType

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
… DB records have been generated in CreateInstanceFromBackup

This ensures any device modifications are applied to the on-disk backup.yaml file.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
…d/db` to `lxd/instance/instancetype` package

Signed-off-by: Gabriel Mougard <gabriel.mougard@canonical.com>
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
…andInstanceDevices

And switches to one in instance/instancetype package.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
…orkServerErrorLogWriter_shouldDiscard

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
…m volumes

This fixes a situation in which the list of target volume snaphots gets appended with the right snapshot
but wrong parent volume (source instead of target volume).

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
… import

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
Signed-off-by: Mark Laing <mark.laing@canonical.com>
To keep in sync with main branch.

Also adds devices support to CreateInstanceFromBackup.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
@tomponline tomponline self-assigned this Mar 26, 2024
@github-actions github-actions bot added the Documentation Documentation needs updating label Mar 26, 2024
@tomponline tomponline merged commit 65a7c14 into canonical:stable-5.0 Mar 26, 2024
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Documentation needs updating
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants