-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Fix KVM incremental volume snapshot creation #12666
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
Open
JoaoJandre
wants to merge
1
commit into
apache:4.22
Choose a base branch
from
scclouds:fix-incremental-snapshot-creation
base: 4.22
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+19
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2093,8 +2093,25 @@ protected void rebaseSnapshot(SnapshotObjectTO snapshotObjectTO, KVMStoragePool | |
| QemuImg qemuImg = new QemuImg(wait); | ||
| qemuImg.rebase(snapshotFile, parentSnapshotFile, PhysicalDiskFormat.QCOW2.toString(), false); | ||
| } catch (LibvirtException | QemuImgException e) { | ||
| logger.error("Exception while rebasing incremental snapshot [{}] due to: [{}].", snapshotName, e.getMessage(), e); | ||
| throw new CloudRuntimeException(e); | ||
| if (!StringUtils.contains(e.getMessage(), "Is another process using the image")) { | ||
| logger.error("Exception while rebasing incremental snapshot [{}] due to: [{}].", snapshotName, e.getMessage(), e); | ||
| throw new CloudRuntimeException(e); | ||
| } | ||
| retryRebase(snapshotName, wait, e, snapshotFile, parentSnapshotFile); | ||
| } | ||
| } | ||
|
|
||
| private void retryRebase(String snapshotName, int wait, Exception e, QemuImgFile snapshotFile, QemuImgFile parentSnapshotFile) { | ||
| logger.warn("Libvirt still has not released the lock, will wait 60 seconds and try again later."); | ||
| try { | ||
| Thread.sleep(60*1000); | ||
JoaoJandre marked this conversation as resolved.
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is it required to keep this wait time configurable? |
||
| QemuImg qemuImg = new QemuImg(wait); | ||
JoaoJandre marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| qemuImg.rebase(snapshotFile, parentSnapshotFile, PhysicalDiskFormat.QCOW2.toString(), false); | ||
| } catch (LibvirtException | QemuImgException | InterruptedException ex) { | ||
JoaoJandre marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| logger.error("Unable to rebase snapshot [{}].", snapshotName, ex); | ||
| CloudRuntimeException cre = new CloudRuntimeException(ex); | ||
| cre.addSuppressed(e); | ||
| throw cre; | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
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.
@JoaoJandre is this string case sensitive? can you paste the sample error message here. thanks.
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.
@sureshanaparti :