Skip to content

xenserver: attempt eject and destroying patch VBD separately #5053

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.

Sign up for GitHub

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

Merged
yadvr merged 2 commits into from
Jun 1, 2021
Merged

xenserver: attempt eject and destroying patch VBD separately #5053

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d19f86
xenserver: attempt eject and destroying patch VBD separately
yadvr May 31, 2021
99139c2
fix boo-boo
yadvr Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions ...s/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,13 +1507,13 @@ public void destroyPatchVbd(final Connection conn, final Set<VM> vms) throws Xml
final VDI patchVDI = findPatchIsoVDI(conn, sr);
for (final VM vm : vms) {
final String vmName = vm.getNameLabel(conn);
try {
if (!vmName.startsWith("r-") && !vmName.startsWith("s-") && !vmName.startsWith("v-")) {
return;
}
final Set<VBD> vbds = vm.getVBDs(conn);
for (final VBD vbd : vbds) {
if (Types.VbdType.CD.equals(vbd.getType(conn))) {
if (!vmName.startsWith("r-") && !vmName.startsWith("s-") && !vmName.startsWith("v-")) {
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To simplify the validation, we could use StringUtils.startsWithAny, from commons.lang3:

if (!StringUtils.startsWithAny(vmName, "r-", "s-", v-")) {

Copy link
Copy Markdown
Member Author

@yadvr yadvr Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would hesitate to make any further changes at this point. Feel free to raise a PR.

continue;
Copy link
Copy Markdown
Member Author

@yadvr yadvr Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shwstppr this was the fix :( cc @vladimirpetrov @borisstoyanov

}
final Set<VBD> vbds = vm.getVBDs(conn);
for (final VBD vbd : vbds) {
if (Types.VbdType.CD.equals(vbd.getType(conn))) {
try {
if (!vbd.getEmpty(conn)) {
vbd.eject(conn);
}
Expand All @@ -1522,12 +1522,16 @@ public void destroyPatchVbd(final Connection conn, final Set<VM> vms) throws Xml
vbd.insert(conn, patchVDI);
vbd.eject(conn);
}
} catch (Exception e) {
s_logger.debug("Cannot eject CD-ROM device for VM " + vmName + " due to " + e.toString(), e);
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should an exception be logged in debug?

Copy link
Copy Markdown
Member Author

@yadvr yadvr Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignorable errors, not logged to avoid confusion for admin/user. 99.99% we'll never hit that.

}
try {
vbd.destroy(conn);
break;
} catch (Exception e) {
s_logger.debug("Cannot destroy CD-ROM device for VM " + vmName + " due to " + e.toString(), e);
Copy link
Copy Markdown
Contributor

@GutoVeronezi GutoVeronezi Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Copy link
Copy Markdown
Member Author

@yadvr yadvr Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignorable errors, not logged to avoid confusion for admin/user. 99.99% we'll never hit that.

}
break;
}
} catch (final Exception e) {
s_logger.debug("Cannot destroy CD-ROM device for VM " + vmName + " due to " + e.toString(), e);
}
}
}
Expand Down