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

rbd: use DeepCopy() to create thick-provisioned volumes from a snapshot (backport #2184) #2202

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2021

This is an automatic backport of pull request #2184 done by Mergify.
Cherry-pick of 7f1bdb4 has failed:

On branch mergify/bp/release-v3.3/pr-2184
Your branch is up to date with 'origin/release-v3.3'.

You are currently cherry-picking commit 7f1bdb49.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/rbd/controllerserver.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit 7f1bdb4)

# Conflicts:
#	internal/rbd/controllerserver.go
In case restoring a snapshot of a thick-PVC failed during DeepCopy(),
the image will exist, but have partial contents. Only when the image has
the thick-provisioned metadata set, it has completed DeepCopy().

When the metadata is missing, the image is deleted, and an error is
returned to the caller. Kubernetes will automatically retry provisioning
on the ABORTED error, and the restoring will get restarted from the
beginning.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit d2c4cac)
When cloning a volume from a (CSI) snapshot, we use DeepCopy() and do
not need an RBD snapshot as source.

Suggested-by: Madhu Rajanna <madhupr007@gmail.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit eeec447)
@mergify mergify bot added conflicts component/rbd Issues related to RBD labels Jun 23, 2021
@nixpanic
Copy link
Member

This needs rebasing on top of #2187

@nixpanic
Copy link
Member

nixpanic commented Jul 6, 2021

This won't work on the Ceph version that is used by the release-v3.3 branch.

@nixpanic nixpanic closed this Jul 6, 2021
@nixpanic nixpanic deleted the mergify/bp/release-v3.3/pr-2184 branch July 6, 2021 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/rbd Issues related to RBD conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant