Since libvirt called bind() and listen() on the UNIX socket, it is
guaranteed that connect() will immediately succeed, if QEMU is running
normally. It will only fail if QEMU has closed the monitor socket by
mistake or if QEMU has exited, letting the kernel close it.
With this in mind we can remove the retry loop and timeout when
connecting to the QEMU monitor if we are doing FD passing. Libvirt can
go straight to sending the QMP greeting and will simply block waiting
for a reply until QEMU is ready.
Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_monitor.c | 54 ++++++++++++++++++++++++++------------------
src/qemu/qemu_monitor.h | 1 +
src/qemu/qemu_process.c | 27 ++++++++++++++++------
tests/qemumonitortestutils.c | 1 +
5 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 59bae67945..f27d0544ff 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4128,7 +4128,7 @@ virQEMUCapsInitQMPCommandRun(virQEMUCapsInitQMPCommandPtr cmd,
cmd->vm->pid = cmd->pid;
- if (!(cmd->mon = qemuMonitorOpen(cmd->vm, &cmd->config, true,
+ if (!(cmd->mon = qemuMonitorOpen(cmd->vm, &cmd->config, true, true,
0, &callbacks, NULL)))
goto ignore;
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 22f05222db..130490bde8 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -349,6 +349,7 @@ qemuMonitorDispose(void *obj)
static int
qemuMonitorOpenUnix(const char *monitor,
pid_t cpid,
+ bool retry,
unsigned long long timeout)
{
struct sockaddr_un addr;
@@ -370,31 +371,39 @@ qemuMonitorOpenUnix(const char *monitor,
goto error;
}
- if (virTimeBackOffStart(&timebackoff, 1, timeout * 1000) < 0)
- goto error;
- while (virTimeBackOffWait(&timebackoff)) {
- ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
-
- if (ret == 0)
- break;
+ if (retry) {
+ if (virTimeBackOffStart(&timebackoff, 1, timeout * 1000) < 0)
+ goto error;
+ while (virTimeBackOffWait(&timebackoff)) {
+ ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
- if ((errno == ENOENT || errno == ECONNREFUSED) &&
- (!cpid || virProcessKill(cpid, 0) == 0)) {
- /* ENOENT : Socket may not have shown up yet
- * ECONNREFUSED : Leftover socket hasn't been removed yet */
- continue;
- }
+ if (ret == 0)
+ break;
- virReportSystemError(errno, "%s",
- _("failed to connect to monitor socket"));
- goto error;
+ if ((errno == ENOENT || errno == ECONNREFUSED) &&
+ (!cpid || virProcessKill(cpid, 0) == 0)) {
+ /* ENOENT : Socket may not have shown up yet
+ * ECONNREFUSED : Leftover socket hasn't been removed yet */
+ continue;
+ }
- }
+ virReportSystemError(errno, "%s",
+ _("failed to connect to monitor socket"));
+ goto error;
+ }
- if (ret != 0) {
- virReportSystemError(errno, "%s",
- _("monitor socket did not show up"));
- goto error;
+ if (ret != 0) {
+ virReportSystemError(errno, "%s",
+ _("monitor socket did not show up"));
+ goto error;
+ }
+ } else {
+ ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
+ if (ret < 0) {
+ virReportSystemError(errno, "%s",
+ _("failed to connect to monitor socket"));
+ goto error;
+ }
}
return monfd;
@@ -914,6 +923,7 @@ qemuMonitorPtr
qemuMonitorOpen(virDomainObjPtr vm,
virDomainChrSourceDefPtr config,
bool json,
+ bool retry,
unsigned long long timeout,
qemuMonitorCallbacksPtr cb,
void *opaque)
@@ -928,7 +938,7 @@ qemuMonitorOpen(virDomainObjPtr vm,
case VIR_DOMAIN_CHR_TYPE_UNIX:
hasSendFD = true;
if ((fd = qemuMonitorOpenUnix(config->data.nix.path,
- vm->pid, timeout)) < 0)
+ vm->pid, retry, timeout)) < 0)
return NULL;
break;
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 9556a51341..c539c41b1d 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -320,6 +320,7 @@ char *qemuMonitorUnescapeArg(const char *in);
qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm,
virDomainChrSourceDefPtr config,
bool json,
+ bool retry,
unsigned long long timeout,
qemuMonitorCallbacksPtr cb,
void *opaque)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d0adc8aa3b..3c8718676d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1771,7 +1771,7 @@ qemuProcessInitMonitor(virQEMUDriverPtr driver,
static int
qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
- qemuDomainLogContextPtr logCtxt)
+ bool retry, qemuDomainLogContextPtr logCtxt)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
qemuMonitorPtr mon = NULL;
@@ -1802,6 +1802,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
mon = qemuMonitorOpen(vm,
monConfig,
priv->monJSON,
+ retry,
timeout,
&monitorCallbacks,
driver);
@@ -2179,17 +2180,23 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver,
{
int ret = -1;
virHashTablePtr info = NULL;
- qemuDomainObjPrivatePtr priv;
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ bool retry = true;
+
+ if (priv->qemuCaps &&
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS))
+ retry = false;
- VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name);
- if (qemuConnectMonitor(driver, vm, asyncJob, logCtxt) < 0)
+ VIR_DEBUG("Connect monitor to vm=%p name='%s' retry=%d",
+ vm, vm->def->name, retry);
+
+ if (qemuConnectMonitor(driver, vm, asyncJob, retry, logCtxt) < 0)
goto cleanup;
/* Try to get the pty path mappings again via the monitor. This is much more
* reliable if it's available.
* Note that the monitor itself can be on a pty, so we still need to try the
* log output method. */
- priv = vm->privateData;
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
goto cleanup;
ret = qemuMonitorGetChardevInfo(priv->mon, &info);
@@ -7263,6 +7270,7 @@ qemuProcessReconnect(void *opaque)
unsigned int stopFlags = 0;
bool jobStarted = false;
virCapsPtr caps = NULL;
+ bool retry = true;
VIR_FREE(data);
@@ -7293,10 +7301,15 @@ qemuProcessReconnect(void *opaque)
* allowReboot in status XML and we need to initialize it. */
qemuProcessPrepareAllowReboot(obj);
- VIR_DEBUG("Reconnect monitor to %p '%s'", obj, obj->def->name);
+ if (priv->qemuCaps &&
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS))
+ retry = false;
+
+ VIR_DEBUG("Reconnect monitor to def=%p name='%s' retry=%d",
+ obj, obj->def->name, retry);
/* XXX check PID liveliness & EXE path */
- if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, NULL) < 0)
+ if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, retry, NULL) < 0)
goto error;
if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0)
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 66bccac9a4..9808e972c8 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -1252,6 +1252,7 @@ qemuMonitorTestNew(bool json,
if (!(test->mon = qemuMonitorOpen(test->vm,
&src,
json,
+ true,
0,
&qemuMonitorTestCallbacks,
driver)))
--
2.14.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
