fix(bakups): fix merge resume issue when child is disk chain#9668
Open
spacotte-vates wants to merge 2 commits intomasterfrom
Open
fix(bakups): fix merge resume issue when child is disk chain#9668spacotte-vates wants to merge 2 commits intomasterfrom
spacotte-vates wants to merge 2 commits intomasterfrom
Conversation
Comment on lines
+916
to
+919
| await parent.init({ force: isResumingMerge }) | ||
| await child1.init({ force: isResumingMerge }) | ||
| await child2.init({ force: isResumingMerge }) | ||
| await childDiskChain.init({ force: isResumingMerge }) |
Contributor
There was a problem hiding this comment.
I think force is false by default no? We can secure it but I think it s
Suggested change
| await parent.init({ force: isResumingMerge }) | |
| await child1.init({ force: isResumingMerge }) | |
| await child2.init({ force: isResumingMerge }) | |
| await childDiskChain.init({ force: isResumingMerge }) | |
| await parent.init({ force: false }) | |
| await child1.init({ force: false }) | |
| await child2.init({ force: false }) | |
| await childDiskChain.init({ force: false }) |
Contributor
pierrebrunet289
left a comment
pierrebrunet289
left a comment
There was a problem hiding this comment.
LGTM
Just missing changelog
Comment on lines
+955
to
+958
| await parent2.init({ force: isResumingMerge2 }) | ||
| await child1b.init({ force: isResumingMerge2 }) | ||
| await child2b.init({ force: isResumingMerge2 }) | ||
| await childDiskChain2.init({ force: isResumingMerge2 }) |
Contributor
There was a problem hiding this comment.
Suggested change
| await parent2.init({ force: isResumingMerge2 }) | |
| await child1b.init({ force: isResumingMerge2 }) | |
| await child2b.init({ force: isResumingMerge2 }) | |
| await childDiskChain2.init({ force: isResumingMerge2 }) | |
| await parent2.init({ force: true }) | |
| await child1b.init({ force: true }) | |
| await child2b.init({ force: true }) | |
| await childDiskChain2.init({ force: true }) |
Collaborator
There was a problem hiding this comment.
we have confirmed that isResumingMerge is true immediatly above
Comment on lines
288
to
305
| if (this.#removeUnused) { | ||
| await childDisk.unlink() | ||
| } | ||
|
|
||
| try { | ||
| await parentDisk.rename(mergeTargetPath) | ||
| } catch (error) { | ||
| // @ts-ignore | ||
| if (error.code === 'ENOENT' && this.#isResuming) { | ||
| // @ts-ignore | ||
| this.#logInfo(`the parent disk was already renamed`, { | ||
| parent: parentDisk.getPath(), | ||
| mergeTarget: mergeTargetPath, | ||
| }) | ||
| } else { | ||
| throw error | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Just an idea: To avoid a potential issue if merge is interrupted exactly at this moment (I think it is a rare possibility but still...)
Suggested change
| try { | |
| await parentDisk.rename(mergeTargetPath) | |
| } catch (error) { | |
| // @ts-ignore | |
| if (error.code === 'ENOENT' && this.#isResuming) { | |
| // @ts-ignore | |
| this.#logInfo(`the parent disk was already renamed`, { | |
| parent: parentDisk.getPath(), | |
| mergeTarget: mergeTargetPath, | |
| }) | |
| } else { | |
| throw error | |
| } | |
| } | |
| if (this.#removeUnused) { | |
| await childDisk.unlink() | |
| } | |
| } |
Collaborator
There was a problem hiding this comment.
I think this is irrelevant to this PR, but can be a good idea as a separated, not in patch, PR
fbeauchamp
requested changes
Apr 3, 2026
Comment on lines
+212
to
+215
| this.#state.chain = | ||
| childPaths !== undefined | ||
| ? [parentDisk.getPath(), ...childPaths].map(p => relativeFromFile(this.#statePath, p)) | ||
| : undefined |
Collaborator
There was a problem hiding this comment.
there is a chain even if you merge only two disk , don't rely on the fallback mechanism of cleanVm
Comment on lines
288
to
305
| if (this.#removeUnused) { | ||
| await childDisk.unlink() | ||
| } | ||
|
|
||
| try { | ||
| await parentDisk.rename(mergeTargetPath) | ||
| } catch (error) { | ||
| // @ts-ignore | ||
| if (error.code === 'ENOENT' && this.#isResuming) { | ||
| // @ts-ignore | ||
| this.#logInfo(`the parent disk was already renamed`, { | ||
| parent: parentDisk.getPath(), | ||
| mergeTarget: mergeTargetPath, | ||
| }) | ||
| } else { | ||
| throw error | ||
| } | ||
| } |
Collaborator
There was a problem hiding this comment.
I think this is irrelevant to this PR, but can be a good idea as a separated, not in patch, PR
Comment on lines
+955
to
+958
| await parent2.init({ force: isResumingMerge2 }) | ||
| await child1b.init({ force: isResumingMerge2 }) | ||
| await child2b.init({ force: isResumingMerge2 }) | ||
| await childDiskChain2.init({ force: isResumingMerge2 }) |
Collaborator
There was a problem hiding this comment.
we have confirmed that isResumingMerge is true immediatly above
fbeauchamp
approved these changes
Apr 3, 2026
pierrebrunet289
requested changes
Apr 7, 2026
Contributor
pierrebrunet289
left a comment
pierrebrunet289
left a comment
There was a problem hiding this comment.
just the changelogs to add as it is a patch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Short explanation of this PR (feel free to re-use commit message)
Checklist
Fixes #007,See xoa-support#42,See https://...)Introduced byCHANGELOG.unreleased.mdReview process
If you are an external contributor, you can skip this part. Simply create the pull request, and we'll get back to you as soon as possible.
Notes: