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

fix(backups,vhd-lib): merge with VhdSynthetic #6317

Merged
merged 5 commits into from
Jul 7, 2022
Merged

Conversation

fbeauchamp
Copy link
Collaborator

@fbeauchamp fbeauchamp commented Jul 6, 2022

introduced by #6184

test recipe I followed :

  • make backups to have a chain of at least 4 vhds
  • make a 5th backup, it should merge , no warning during cleanup
  • reduce backup retention by 2
  • merge should occurs, only 2 backup should be restorable
  • make a new backup

ensure there is changed data between backup, for exemaple with a reboot

use two remote : one with vhdfile and another with vhd directory

Check list

Check if done, if not relevant leave unchecked.

  • PR reference the relevant issue (e.g. Fixes #007 or See xoa-support#42)
  • if UI changes, a screenshot has been added to the PR
  • documentation updated
  • CHANGELOG.unreleased.md:
    • enhancement/bug fix entry added
    • list of packages to release updated (${name} v${new version})
  • I have tested added/updated features (and impacted code)

Process

  1. create a PR as soon as possible
  2. mark it as WiP: (Work in Progress) if not ready to be merged
  3. when you want a review, add a reviewer (and only one)
  4. if necessary, update your PR, and re- add a reviewer

From the Four Agreements:

  1. Be impeccable with your word.
  2. Don't take anything personally.
  3. Don't make assumptions.
  4. Always do your best.

@fbeauchamp fbeauchamp force-pushed the fix_vhd-synthetic branch 2 times, most recently from f4b903f to 28a8cd8 Compare July 6, 2022 14:29
@fbeauchamp fbeauchamp marked this pull request as ready for review July 6, 2022 15:31
@fbeauchamp fbeauchamp requested a review from julien-f July 6, 2022 15:31
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
@fbeauchamp fbeauchamp requested a review from julien-f July 7, 2022 09:10
CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
fbeauchamp and others added 2 commits July 7, 2022 15:42
@fbeauchamp fbeauchamp requested a review from julien-f July 7, 2022 13:42
@julien-f julien-f changed the title Fix(merge) : merge multiple fix(backups,vhd-lib): merge with VhdSynthetic Jul 7, 2022
@julien-f julien-f merged commit 30fe976 into master Jul 7, 2022
@julien-f julien-f deleted the fix_vhd-synthetic branch July 7, 2022 14:57
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.

2 participants