10:01 a.m.
Previously, if any domain was still running, the driver was unable to
reconnect to it, preventing further interactions with running domain.
To resolve this, the driver now attempts to reconnect to the domains'
monitors, which transient definitions are stored in state dir,
during the initialization step. This allows us to perform further
actions on domains even if the CH driver was restarted.
Resolves: https://gitlab.com/libvirt/libvirt/-/issues/743
Signed-off-by: Kirill Shchetiniuk <kshcheti(a)redhat.com>
---
src/ch/ch_driver.c | 2 +
src/ch/ch_monitor.c | 65 +++++++++++++++++++++++++
src/ch/ch_monitor.h | 2 +
src/ch/ch_process.c | 116 ++++++++++++++++++++++++++++++++++++++++++++
src/ch/ch_process.h | 2 +
5 files changed, 187 insertions(+)
diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index 4ce68c9299..465528baf1 100644
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -1489,6 +1489,8 @@ chStateInitialize(bool privileged,
NULL, NULL) < 0)
goto cleanup;
+ virCHProcessReconnectAll(ch_driver);
+
ch_driver->chCaps = virCHCapsInitCHVersionCaps(ch_driver->version);
ch_driver->privileged = privileged;
diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c
index 1dc085a755..4ea79506ce 100644
--- a/src/ch/ch_monitor.c
+++ b/src/ch/ch_monitor.c
@@ -581,6 +581,71 @@ chMonitorCreateSocket(const char *socket_path)
return -1;
}
+virCHMonitor *
+virCHMonitorReconnectNew(virDomainObj *vm, virCHDriverConfig *cfg)
+{
+ g_autoptr(virCHMonitor) mon = NULL;
+ virCHDomainObjPrivate *priv = vm->privateData;
+ int event_monitor_fd;
+ int rv;
+
+ if (virCHMonitorInitialize() < 0)
+ return NULL;
+
+ if (!(mon = virObjectLockableNew(virCHMonitorClass)))
+ return NULL;
+
+ mon->eventmonitorfd = -1;
+
+ if (!vm->def) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("VM is not defined"));
+ return NULL;
+ }
+
+ mon->socketpath = g_strdup_printf("%s/%s-socket",
+ cfg->stateDir, vm->def->name);
+
+ mon->eventmonitorpath = g_strdup_printf("%s/%s-event-monitor-fifo",
+ cfg->stateDir, vm->def->name);
+
+ if ((rv = virPidFileReadPathIfLocked(priv->pidfile, &mon->pid)) < 0) {
+ VIR_WARN("Pidfile of %1$s can't be read error",
vm->def->name);
+ return NULL;
+ }
+
+ if (mon->pid == -1) {
+ VIR_WARN("Vm %1$s isn't running", vm->def->name);
+ return NULL;
+ }
+
+ VIR_DEBUG("CH vm=%p name=%s is running as pid=%lld", vm,
vm->def->name, (long long)vm->pid);
+
+ /* open the reader end of fifo before start Event Handler */
+ while ((event_monitor_fd = open(mon->eventmonitorpath, O_RDONLY)) < 0) {
+ if (errno == EINTR) {
+ g_usleep(100000);
+ continue;
+ }
+ VIR_ERROR(_("%1$s: Failed to open the event monitor FIFO(%2$s) read
end!"),
+ vm->def->name, mon->eventmonitorpath);
+ return NULL;
+ }
+
+ mon->eventmonitorfd = event_monitor_fd;
+ VIR_DEBUG("%s: Opened the event monitor FIFO(%s)", vm->def->name,
mon->eventmonitorpath);
+
+ mon->vm = virObjectRef(vm);
+
+ if (virCHStartEventHandler(mon) < 0)
+ return NULL;
+
+ mon->handle = curl_easy_init();
+
+ return g_steal_pointer(&mon);
+}
+
+
virCHMonitor *
virCHMonitorNew(virDomainObj *vm, virCHDriverConfig *cfg, int logfile)
{
diff --git a/src/ch/ch_monitor.h b/src/ch/ch_monitor.h
index 185de0dbfd..f6d7119c96 100644
--- a/src/ch/ch_monitor.h
+++ b/src/ch/ch_monitor.h
@@ -143,3 +143,5 @@ virCHMonitorBuildNetJson(virDomainNetDef *netdef,
int virCHMonitorBuildRestoreJson(virDomainDef *vmdef,
const char *from,
char **jsonstr);
+
+virCHMonitor *virCHMonitorReconnectNew(virDomainObj *vm, virCHDriverConfig *cfg);
diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c
index 08331352a4..d7a5ecc09c 100644
--- a/src/ch/ch_process.c
+++ b/src/ch/ch_process.c
@@ -1194,3 +1194,119 @@ virCHProcessStartRestore(virCHDriver *driver, virDomainObj *vm,
const char *from
virCHProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
return ret;
}
+
+
+struct virCHProcessReconnectData
+{
+ virDomainObj *vm;
+ virCHDriver *driver;
+};
+
+
+static void
+virCHProcessReconnect(void *opaque)
+{
+ struct virCHProcessReconnectData *data = opaque;
+ virDomainObj *vm = data->vm;
+ virCHDriver *driver = data->driver;
+ g_autoptr(virCHDriverConfig) cfg = virCHDriverGetConfig(driver);
+ virCHDomainObjPrivate *priv = vm->privateData;
+
+ if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY))
+ goto error;
+
+ VIR_DEBUG("Reconnecting to vm=%p name=%s", vm, vm->def->name);
+
+ /* Build pidfile path where is running domain pid stored */
+ if (!(priv->pidfile = virPidFileBuildPath(cfg->stateDir, vm->def->name)))
{
+ virReportSystemError(errno, "%s", _("Failed to build pidfile
path."));
+ goto error;
+ }
+
+ /* Create new monitor object without new CH startup */
+ if (!priv->monitor) {
+ if (!(priv->monitor = virCHMonitorReconnectNew(vm, cfg)))
+ goto error;
+ }
+
+ vm->pid = priv->monitor->pid;
+ vm->def->id = vm->pid;
+ priv->machineName = virCHDomainGetMachineName(vm);
+
+ if (!priv->machineName)
+ goto error;
+
+ if (virDomainCgroupConnectCgroup("ch",
+ vm,
+ &priv->cgroup,
+ cfg->cgroupControllers,
+ priv->driver->privileged,
+ priv->machineName) < 0)
+ goto error;
+
+
+ if (virDomainInterfaceStartDevices(vm->def) < 0)
+ goto error;
+
+ virCHProcessUpdateInfo(vm);
+
+ if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
+ goto error;
+
+ cleanup:
+ virDomainObjEndJob(vm);
+ virDomainObjEndAPI(&vm);
+ return;
+
+ error:
+ virCHProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
+
+ goto cleanup;
+}
+
+static int
+virCHProcessReconnectHelper(virDomainObj *vm, void *opaque)
+{
+ struct virCHProcessReconnectData *src = opaque;
+ struct virCHProcessReconnectData *data;
+ virThread thread;
+ g_autofree char *name = NULL;
+
+ /* Skip reconnect is domain if is not running */
+ if (vm->pid == 0)
+ return 0;
+
+ data = g_new0(struct virCHProcessReconnectData, 1);
+
+ memcpy(data, src, sizeof(*data));
+ data->vm = vm;
+
+ virObjectLock(vm);
+ virObjectRef(vm);
+
+ name = g_strdup_printf("reconnect-%s", vm->def->name);
+
+ VIR_DEBUG("Reconnecting vm=%p name=%s", vm, vm->def->name);
+
+ if (virThreadCreateFull(&thread, false, virCHProcessReconnect,
+ name, false, data) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Could not create thread."));
+
+ virCHProcessStop(src->driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
+
+ virDomainObjEndAPI(&vm);
+ VIR_FREE(data);
+ return -1;
+ }
+
+ return 0;
+}
+
+void
+virCHProcessReconnectAll(virCHDriver *driver)
+{
+ struct virCHProcessReconnectData data = {.driver = driver};
+ virDomainObjListForEach(driver->domains, true,
+ virCHProcessReconnectHelper, &data);
+}
diff --git a/src/ch/ch_process.h b/src/ch/ch_process.h
index 7a6995b7cf..ff8267b497 100644
--- a/src/ch/ch_process.h
+++ b/src/ch/ch_process.h
@@ -38,3 +38,5 @@ int virCHProcessStartRestore(virCHDriver *driver,
const char *from);
int virCHProcessUpdateInfo(virDomainObj *vm);
+
+void virCHProcessReconnectAll(virCHDriver *driver);
--
2.48.1