-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Identify Guest Agent connection error by the ordinal instead of message (KBOSS) #13789
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
GaOrtiga
wants to merge
1
commit into
apache:main
Choose a base branch
from
scclouds:preventBackupErrorGuestAgentConnectionFail
base: main
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.
+3
−3
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
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 |
|---|---|---|
|
|
@@ -610,7 +610,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv | |
|
|
||
| public static final String CGROUP_V2 = "cgroup2fs"; | ||
|
|
||
| public static final String AGENT_IS_NOT_CONNECTED = "QEMU guest agent is not connected"; | ||
| public static final Integer AGENT_UNRESPONSIVE_ERROR_ORDINAL = 86; | ||
|
|
||
| /** | ||
| * Virsh command to merge (blockcommit) snapshot into the base file.<br><br> | ||
|
|
@@ -7185,7 +7185,7 @@ public Map<String, Long> createDiskOnlyVmSnapshotForRunningVm(List<Pair<VolumeOb | |
| } catch (LibvirtException e) { | ||
| String errorMsg = String.format("Creation of disk-only VM snapshot for VM [%s] failed due to %s.", vmName, e.getMessage()); | ||
| boolean isVmConsistent = false; | ||
| if (e.getMessage().contains(AGENT_IS_NOT_CONNECTED)) { | ||
| if (AGENT_UNRESPONSIVE_ERROR_ORDINAL.equals(e.getError().getCode().ordinal())) { | ||
|
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. Also valid |
||
| errorMsg = "QEMU guest agent is not connected. If the VM has been recently started, it might connect soon. Otherwise the VM does not have the" + | ||
| " guest agent installed; thus the QuiesceVM parameter is not supported."; | ||
| isVmConsistent = true; | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -92,7 +92,7 @@ private boolean waitForBoot(ValidateKbossVmCommand cmd, Domain vm) throws Libvir | |
| return true; | ||
| } | ||
| } catch (LibvirtException ex) { | ||
| if (!ex.getMessage().contains(LibvirtComputingResource.AGENT_IS_NOT_CONNECTED)) { | ||
| if (!LibvirtComputingResource.AGENT_UNRESPONSIVE_ERROR_ORDINAL.equals(ex.getError().getCode().ordinal())) { | ||
|
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. I have to agree with the robot in this. Using the enum is much better then using the ordinal. |
||
| logger.error("Got an unexpected Libvirt Exception, giving up on validating VM [{}].", vm.getName(), ex); | ||
| throw ex; | ||
| } | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.