11:06 a.m.
On 06/23/2015 07:13 AM, Pavel Hrdina wrote:
Some guests lock the tray and QEMU eject command will simply fail to
eject the media. But the guest OS can handle this attempt to eject the
media and can unlock the tray and open it. In this case, we should try
again to actually eject the media.
If the first attempt fails we will wait for tray to open and try again
to eject the media, but if the second attempt fails, returns with error.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1147471
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/qemu/qemu_hotplug.c | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 0628964..0cebaad 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -201,13 +201,17 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
}
if (ret < 0)
- goto error;
+ VIR_DEBUG("tray is probably locked, wait for the guest to unlock "
+ "the tray and open it");
There are more reasons than waiting for the unlock that would cause a
negative value to be returned, so this seems "dangerous"..
!mon
if json
!cmd
qemuMonitorJSONCommand failure
qemuMonitorJSONCheckError failure
else
virAsprintf Failure
qemuMonitorHMPCommand failure
c_strcasestr failure
Is there no way to determine that the failure was due to a locked tray
from the error message? The bz notes a DEVICE_TRAY_MOVED event, but I
don't see that here.
I would think that if this is "handle-able" from qemu/json only, then
the qemuMonitorJSONEjectMedia would be the best place to at least check
for this path of retry logic.
You'll have the json error returned (per the link in bz comment 3):
{"error": {"class": "GenericError", "desc":
"Device 'cd' is locked"}}
That should be parse-able by this code and either handled back in the
caller or in this code.
Since qemuMonitorJSONEjectMedia doesn't list return values, perhaps use
"-1" to mean total failure, 0 to mean pseudo-success as it does today,
and 1 to indicate tray was locked and that the caller can/should retry.
FWIW: By pseudo-success... I see that if 0 is currently returned, the
while loop will look for the "tray_status == VIR_DOMAIN_DISK_TRAY_OPEN"
and fail if not eventually seen
Consider the following...
bool retry_lock_tray = false;
do {
qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorEjectMedia(priv->mon, driveAlias, force);
if (qemuDomainObjExitMonitor(driver, vm) < 0) {
ret = -1;
goto cleanup;
}
/* We already tried, but got the locked error again */
if (ret == 1 && retry_lock_tray) {
some sort of failure since you retried
ret = -1;
goto error;
}
/* We were locked, but haven't retried */
if (ret == 1) {
Wait some period of time for the DEVICE_TRAY_MOVED event
if event found
retry_lock_tray = true;
}
} while (retry_lock_tray);
if (ret < 0)
goto error;
if (ret == 1) {
ERROR tray locked by guest, never got DEVICE_TRAY_MOVED
ret = -1;
got error;
}
virObjectRef(vm);
/* we don't want to report errors from media tray_open polling */
while (retries) {
- if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)
+ if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) {
+ ret = 0;
+ virResetLastError();
break;
+ }
retries--;
virObjectUnlock(vm);
If it's locked how would this loop ever succeed? That is how would the
tray open "magically" if it's locked and we haven't sent another eject
request?
@@ -218,10 +222,29 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr
driver,
virObjectUnref(vm);
if (retries <= 0) {
- virReportError(VIR_ERR_OPERATION_FAILED, "%s",
- _("Unable to eject media"));
- ret = -1;
+ /* Report a new error only if the first attempt don't fail and we don't
+ * receive VIR_DOMAIN_DISK_TRAY_OPEN event, otherwise report the error
+ * from first attempt. */
+ if (ret == 0) {
+ virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+ _("Unable to eject media"));
+ ret = -1;
+ }
goto error;
+ } else {
+ /* QEMU will send eject request to guest, but if the tray is locked,
+ * always returns with error. However the guest can handle the eject
+ * request, unlock the tray and open it. In case this happens, we
+ * should try to eject the media once more. */
+ qemuDomainObjEnterMonitor(driver, vm);
+ ret = qemuMonitorEjectMedia(priv->mon, driveAlias, force);
+ if (qemuDomainObjExitMonitor(driver, vm) < 0) {
+ ret = -1;
+ goto cleanup;
+ }
+
+ if (ret < 0)
+ goto error;
}
if (!virStorageSourceIsEmpty(newsrc)) {