-
Notifications
You must be signed in to change notification settings - Fork 273
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
feat(backups/cleanVm): can fully merge VHD chains #6184
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ab93b3f
to
510ab8a
Compare
d5e85cf
to
cf21d07
Compare
ByScripts
requested changes
Apr 21, 2022
ByScripts
approved these changes
Apr 21, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
d373be3
to
55b60be
Compare
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
julien-f
reviewed
May 9, 2022
55b60be
to
79e6883
Compare
79e6883
to
d029a4c
Compare
julien-f
reviewed
May 13, 2022
packages/vhd-lib/merge.js
Outdated
@@ -56,16 +57,19 @@ module.exports = limitConcurrency(2)(async function merge( | |||
flags: 'r+', | |||
checkSecondFooter: mergeState === undefined, | |||
}) | |||
const childVhd = yield openVhd(childHandler, childPath) | |||
const childVhd = yield VhdSynthetic.open(childHandler, childPath) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a comment above the function:
// childPath can be array to create a synthetic VHD from multiple VHDs
Suggested change
const childVhd = yield VhdSynthetic.open(childHandler, childPath) | |
const childVhd = yield Array.isArray(childPath) ? VhdSynthetic.open(childHandler, childPath) : openVhd(childHandler, childPath) |
julien-f
approved these changes
May 13, 2022
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this change,
cleanVm
only knew how to merge a single VHD, now, with the help ofVhdSynthetic
, it can merge the whole chain in a single pass.Check list
Fixes #007
orSee xoa-support#42
)CHANGELOG.unreleased.md
:${name} v${new version}
)cron/parse.spec.js
)xo-server
API changes, the corresponding test has been added to/updated onxo-server-test
Process
WiP:
(Work in Progress) if not ready to be mergedFrom the Four Agreements: