Skip to content

xenserver: check and eject patch vbd for systemvms #4525

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 5 commits into from
Dec 9, 2020
Merged

xenserver: check and eject patch vbd for systemvms #4525

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d962e56
xenserver: check and eject patch vbd for systemvms
yadvr Dec 9, 2020
6cb9b30
try to unplug before destroying
yadvr Dec 9, 2020
8f8615f
fix
yadvr Dec 9, 2020
a2e23fe
workaround fix
yadvr Dec 9, 2020
7fe57cf
add defensive checks
yadvr Dec 9, 2020
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
5 changes: 4 additions & 1 deletion ...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 @@ -1499,7 +1499,10 @@ public void destroyPatchVbd(final Connection conn, final String vmName) throws X
final Set<VBD> vbds = vm.getVBDs(conn);
for (final VBD vbd : vbds) {
if (vbd.getType(conn) == Types.VbdType.CD) {
vbd.eject(conn);
if (!vbd.getEmpty(conn)) {

@sureshanaparti sureshanaparti Dec 9, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rhtyd Makes sense to eject only when ISO is inserted. Verified that this is being handled in all cases before ejecting vdb, except here.

@DaanHoogland DaanHoogland Dec 9, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

agree that it makes sense, but I don't see why this yields the bug @vladimirpetrov saw. However if this fixes it for him, i'm all 馃憤

vbd.eject(conn);
}
vbd.unplug(conn);
vbd.destroy(conn);
break;
}
Expand Down