From nobody Wed May 14 19:26:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523446579986530.6045759527657; Wed, 11 Apr 2018 04:36:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 546A480469; Wed, 11 Apr 2018 11:36:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BF8C5C8BB; Wed, 11 Apr 2018 11:36:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A32854CA9D; Wed, 11 Apr 2018 11:36:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3BBTec8029839 for ; Wed, 11 Apr 2018 07:29:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 906F365906; Wed, 11 Apr 2018 11:29:40 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E3AF5E4E7; Wed, 11 Apr 2018 11:29:37 +0000 (UTC) Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E415BC0587F7; Wed, 11 Apr 2018 11:29:34 +0000 (UTC) Received: by mail-wr0-f176.google.com with SMTP id s18so1415769wrg.9; Wed, 11 Apr 2018 04:29:34 -0700 (PDT) Received: from rst.Home ([2a02:c7d:692a:c500:1ebc:73f3:5f60:b131]) by smtp.gmail.com with ESMTPSA id 185sm1502933wmj.46.2018.04.11.04.29.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 04:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U/DtXw9aFLVHY3y1C3J/Daf9dEpO1ggvac+OAjBs15s=; b=MnSn8klQou+kLAWbpHhbeow4KXd2cYDbQ6KK31EtVEahZytr9H3+QzB2TMhVqKAsL9 Al9AYNuvEW2ZykXmksloA2IKHRtDu1U5gXYuBYWGSxsHmAKchDadYbmV8fXPVWiX7y+o fKfsoMz/T+r0Th60u3j4EIg9XcoZRmoAeG3/yXLGXXsGPrmVjeXvHrVyzc01xB57AFmX RqwNi0qQQDp8qHAf9ck6/YCMlWadjvoVD2bohBgc/IKJWSroB6Vclz+h1X6ZOz2cxQjv qxR0xB5LOu8WapBsmsFFp/d4fyovZsEiLFPdo38MsaDav+iiVYykRfcH4O0SVGVsI/4M sUVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U/DtXw9aFLVHY3y1C3J/Daf9dEpO1ggvac+OAjBs15s=; b=rbtHpKKZ/Gywk94T5NvPK9RkVWkzngR00diBl/4c0l5LDvKa23rWPwV8S0tW5ewzK7 fVTAibrS9aZXziPCdElln2xs9DFpTnzlK+b9byIKIYenpfLHNfmSxa7C7vw3TwQuT6D7 lO4y2iyFEbxk0YuCmARPG+CGpct3VNPRl+qpitygTj2ee8fxsJ1U1wTZriMDIzvCo7oN u5QA7xAztS3HsSCiwU7PTsnjlkaZmAbRzNqTrwzIoZT/flLeQwjkS3eeQ4+xtKDmKVvk T+NZkrxGuvF/tXvhjweqYUF4ASoG2SolReegYfwXK62Qzao4Jn7CCpnjRG2JoSlOn1aU qvcw== X-Gm-Message-State: ALQs6tAht1W6NiYQcUIox0Z1Li4ThEqQen1JJJFQvkgnYA9QtC6PjAcr 44Vfoc292O0ZYX4b+wGOTF6450qC X-Google-Smtp-Source: AIpwx4+/a85G2OPH6m2OdYIubuAZeBU08hW2hHgikzOBqbisY13MzqIdKokfkkH1zbj+nAkMCxLGNA== X-Received: by 10.223.200.145 with SMTP id k17mr3365048wrh.6.1523446173018; Wed, 11 Apr 2018 04:29:33 -0700 (PDT) From: Radostin Stoyanov To: libvir-list@redhat.com Date: Wed, 11 Apr 2018 12:29:14 +0100 Message-Id: <20180411112915.5890-4-rstoyanov1@gmail.com> In-Reply-To: <20180411112915.5890-1-rstoyanov1@gmail.com> References: <20180411112915.5890-1-rstoyanov1@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 11 Apr 2018 11:29:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 11 Apr 2018 11:29:35 +0000 (UTC) for IP:'209.85.128.176' DOMAIN:'mail-wr0-f176.google.com' HELO:'mail-wr0-f176.google.com' FROM:'rstoyanov1@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.139 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.128.176 mail-wr0-f176.google.com 209.85.128.176 mail-wr0-f176.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: kkoukiou@redhat.com, mprivozn@redhat.com, cbosdonnat@suse.com, Radostin Stoyanov Subject: [libvirt] [RFC PATCH 3/4] lxc: Add restore mode for libvirt-lxc X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 11 Apr 2018 11:36:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Extend `lxcContainerStart` with support for restore from fd of directory that contains saved state of lxc container. Signed-off-by: Radostin Stoyanov --- src/lxc/lxc_container.c | 162 +++++++++++++++++++++++++++++++++++++++++++= ++-- src/lxc/lxc_container.h | 3 +- src/lxc/lxc_controller.c | 104 ++++++++++++++++++++++++++++-- src/lxc/lxc_driver.c | 4 +- src/lxc/lxc_process.c | 23 +++++-- src/lxc/lxc_process.h | 1 + 6 files changed, 280 insertions(+), 17 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 532fd0be0..6cd203d7f 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -69,6 +69,8 @@ #include "virprocess.h" #include "virstring.h" =20 +#include "lxc_criu.h" + #define VIR_FROM_THIS VIR_FROM_LXC =20 VIR_LOG_INIT("lxc.lxc_container"); @@ -111,6 +113,7 @@ struct __lxc_child_argv { char **ttyPaths; int handshakefd; int *nsInheritFDs; + int restorefd; }; =20 static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, @@ -263,6 +266,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomain= DefPtr vmDef, * @ttyfd: FD of tty to set as the container console * @npassFDs: number of extra FDs * @passFDs: list of extra FDs + * @restorefd: FD of folder where container was dumped * * Setup file descriptors in the container. @ttyfd is set to be * the container's stdin, stdout & stderr. Any FDs included in @@ -272,7 +276,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomain= DefPtr vmDef, * Returns 0 on success or -1 in case of error */ static int lxcContainerSetupFDs(int *ttyfd, - size_t npassFDs, int *passFDs) + size_t npassFDs, int *passFDs, int restore= fd) { int rc =3D -1; int open_max; @@ -368,6 +372,8 @@ static int lxcContainerSetupFDs(int *ttyfd, } =20 for (fd =3D last_fd + 1; fd < open_max; fd++) { + if (fd =3D=3D restorefd) + continue; int tmpfd =3D fd; VIR_MASS_CLOSE(tmpfd); } @@ -1083,6 +1089,31 @@ static int lxcContainerMountFSDev(virDomainDefPtr de= f, return ret; } =20 +static int lxcContainerMountFSDevPTSRestore(virDomainDefPtr def, + const char *stateDir) +{ + int ret =3D -1; + char *path =3D NULL; + int flags =3D MS_MOVE; + + VIR_DEBUG("Mount /dev/pts stateDir=3D%s", stateDir); + + if (virAsprintf(&path, "%s/%s.devpts", stateDir, def->name) < 0) + return ret; + + VIR_DEBUG("Trying to move %s to /dev/pts", path); + + if (mount(path, "/dev/pts", NULL, flags, NULL) < 0) { + virReportSystemError(errno, _("Failed to mount %s on /dev/pts"), p= ath); + goto cleanup; + } + + ret =3D 0; + cleanup: + VIR_FREE(path); + return ret; +} + static int lxcContainerMountFSDevPTS(virDomainDefPtr def, const char *stateDir) { @@ -2191,6 +2222,116 @@ static int lxcContainerSetHostname(virDomainDefPtr = def) return ret; } =20 +/* + * lxcContainerChildRestore: + * @data: pointer to container arguments + */ +static int lxcContainerChildRestore(void *data) +{ + lxc_child_argv_t *argv =3D data; + virDomainDefPtr vmDef =3D argv->config; + int ttyfd =3D -1; + int ret =3D -1; + char *ttyPath =3D NULL; + virDomainFSDefPtr root; + char *sec_mount_options =3D NULL; + char *stateDir =3D NULL; + + if (vmDef =3D=3D NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("lxcChild() passed invalid vm definition")); + goto cleanup; + } + + if (lxcContainerWaitForContinue(argv->monitor) < 0) { + virReportSystemError(errno, "%s", + _("Failed to read the container continue mess= age")); + goto cleanup; + } + VIR_DEBUG("Received container continue message"); + + if (lxcContainerSetID(vmDef) < 0) + goto cleanup; + + root =3D virDomainGetFilesystemForTarget(vmDef, "/"); + + if (argv->nttyPaths) { + const char *tty =3D argv->ttyPaths[0]; + if (STRPREFIX(tty, "/dev/pts/")) + tty +=3D strlen("/dev/pts/"); + if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", + LXC_STATE_DIR, vmDef->name, tty) < 0) + goto cleanup; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("At least one tty is required")); + goto cleanup; + } + + VIR_DEBUG("Container TTY path: %s", ttyPath); + + ttyfd =3D open(ttyPath, O_RDWR); + if (ttyfd < 0) { + virReportSystemError(errno, _("Failed to open tty %s"), ttyPath); + goto cleanup; + } + VIR_DEBUG("Container TTY fd: %d", ttyfd); + + if (!(sec_mount_options =3D virSecurityManagerGetMountOptions( + argv->securityDriver, + vmDef))) + goto cleanup; + + if (lxcContainerPrepareRoot(vmDef, root, sec_mount_options) < 0) + goto cleanup; + + if (lxcContainerSendContinue(argv->handshakefd) < 0) { + virReportSystemError(errno, "%s", + _("Failed to send continue signal to controlle= r")); + goto cleanup; + } + + VIR_DEBUG("Setting up container's std streams"); + + if (lxcContainerSetupFDs(&ttyfd, argv->npassFDs, + argv->passFDs, argv->restorefd) < 0) + goto cleanup; + + if (virFileResolveAllLinks(LXC_STATE_DIR, &stateDir) < 0) + goto cleanup; + + /* Mounts /dev/pts */ + if (lxcContainerMountFSDevPTSRestore(vmDef, stateDir) < 0) { + virReportSystemError(errno, "%s", _("Failed to mount dev/pts")); + goto cleanup; + } + + if (setsid() < 0) + virReportSystemError(errno, "%s", _("Unable to become session lead= er")); + + VIR_DEBUG("Executing container restore criu function"); + ret =3D lxcCriuRestore(vmDef, argv->restorefd, 0); + + cleanup: + VIR_FORCE_CLOSE(argv->monitor); + VIR_FORCE_CLOSE(argv->handshakefd); + VIR_FORCE_CLOSE(ttyfd); + VIR_FREE(ttyPath); + VIR_FREE(stateDir); + VIR_FREE(sec_mount_options); + + if (ret !=3D 0) { + VIR_DEBUG("Tearing down container"); + fprintf(stderr, + _("Failure in libvirt_lxc startup: %s\n"), + virGetLastErrorMessage()); + } + + return ret; +} + + + /** * lxcContainerChild: * @data: pointer to container arguments @@ -2322,7 +2463,7 @@ static int lxcContainerChild(void *data) VIR_FORCE_CLOSE(argv->handshakefd); VIR_FORCE_CLOSE(argv->monitor); if (lxcContainerSetupFDs(&ttyfd, - argv->npassFDs, argv->passFDs) < 0) + argv->npassFDs, argv->passFDs, -1) < 0) goto cleanup; =20 /* Make init process of the container the leader of the new session. @@ -2403,6 +2544,7 @@ virArch lxcContainerGetAlt32bitArch(virArch arch) * @veths: interface names * @control: control FD to the container * @ttyPath: path of tty to set as the container console + * @restorefd: FD to folder where container was dumped * * Starts a container process by calling clone() with the namespace flags * @@ -2418,7 +2560,8 @@ int lxcContainerStart(virDomainDefPtr def, int handshakefd, int *nsInheritFDs, size_t nttyPaths, - char **ttyPaths) + char **ttyPaths, + int restorefd) { pid_t pid; int cflags; @@ -2436,6 +2579,7 @@ int lxcContainerStart(virDomainDefPtr def, .ttyPaths =3D ttyPaths, .handshakefd =3D handshakefd, .nsInheritFDs =3D nsInheritFDs, + .restorefd =3D restorefd, }; =20 /* allocate a stack for the container */ @@ -2484,10 +2628,16 @@ int lxcContainerStart(virDomainDefPtr def, VIR_DEBUG("Inheriting a UTS namespace"); } =20 - VIR_DEBUG("Cloning container init process"); - pid =3D clone(lxcContainerChild, stacktop, cflags, &args); + if (restorefd !=3D -1) { + VIR_DEBUG("Cloning container process that will spawn criu restore"= ); + pid =3D clone(lxcContainerChildRestore, stacktop, SIGCHLD, &args); + } else { + VIR_DEBUG("Cloning container init process"); + pid =3D clone(lxcContainerChild, stacktop, cflags, &args); + VIR_DEBUG("clone() completed, new container PID is %d", pid); + } + VIR_FREE(stack); - VIR_DEBUG("clone() completed, new container PID is %d", pid); =20 if (pid < 0) { virReportSystemError(errno, "%s", diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index 641e2d460..9a6ac2073 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -58,7 +58,8 @@ int lxcContainerStart(virDomainDefPtr def, int handshakefd, int *nsInheritFDs, size_t nttyPaths, - char **ttyPaths); + char **ttyPaths, + int restorefd); =20 int lxcContainerSetupHostdevCapsMakePath(const char *dev); =20 diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 507bffda0..a5eb5e336 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -146,6 +146,8 @@ struct _virLXCController { virCgroupPtr cgroup; =20 virLXCFusePtr fuse; + + int restore; }; =20 #include "lxc_controller_dispatch.h" @@ -1015,6 +1017,65 @@ static int lxcControllerClearCapabilities(void) return 0; } =20 +static int +lxcControllerFindRestoredPid(int fd) +{ + int initpid =3D 0; + int ret =3D -1; + char *checkpointdir =3D NULL; + char *pidfile =3D NULL; + char *checkpointfd =3D NULL; + int pidfilefd; + char c; + + if (fd < 0) + goto cleanup; + + if (virAsprintf(&checkpointfd, "/proc/self/fd/%d", fd) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to write checkpoint dir path")); + goto cleanup; + } + + if (virFileResolveLink(checkpointfd, &checkpointdir) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to readlink checkpoint dir path")); + goto cleanup; + } + + if (virAsprintf(&pidfile, "%s/pidfile", checkpointdir) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to write pidfile path= ")); + goto cleanup; + } + + if ((pidfilefd =3D virFileOpenAs(pidfile, O_RDONLY, 0, -1, -1, 0)) < 0= ) { + virReportSystemError(pidfilefd, + _("Failed to open domain's pidfile '%s'"), + pidfile); + goto cleanup; + } + + while ((saferead(pidfilefd, &c, 1) =3D=3D 1) && c !=3D EOF) + initpid =3D initpid*10 + c - '0'; + + ret =3D initpid; + + if (virFileRemove(pidfile, -1, -1) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to delete pidfile path")); + } + + cleanup: + VIR_FORCE_CLOSE(fd); + VIR_FORCE_CLOSE(pidfilefd); + VIR_FREE(pidfile); + VIR_FREE(checkpointdir); + VIR_FREE(checkpointfd); + return ret; +} + + static bool wantReboot; static virMutex lock =3D VIR_MUTEX_INITIALIZER; =20 @@ -2327,6 +2388,7 @@ virLXCControllerRun(virLXCControllerPtr ctrl) int containerhandshake[2] =3D { -1, -1 }; char **containerTTYPaths =3D NULL; size_t i; + bool restore_mode =3D (ctrl->restore !=3D -1); =20 if (VIR_ALLOC_N(containerTTYPaths, ctrl->nconsoles) < 0) goto cleanup; @@ -2383,7 +2445,8 @@ virLXCControllerRun(virLXCControllerPtr ctrl) containerhandshake[1], ctrl->nsFDs, ctrl->nconsoles, - containerTTYPaths)) < 0) + containerTTYPaths, + ctrl->restore)) < 0) goto cleanup; VIR_FORCE_CLOSE(control[1]); VIR_FORCE_CLOSE(containerhandshake[1]); @@ -2395,10 +2458,10 @@ virLXCControllerRun(virLXCControllerPtr ctrl) for (i =3D 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) VIR_FORCE_CLOSE(ctrl->nsFDs[i]); =20 - if (virLXCControllerSetupCgroupLimits(ctrl) < 0) + if (!restore_mode && virLXCControllerSetupCgroupLimits(ctrl) < 0) goto cleanup; =20 - if (virLXCControllerSetupUserns(ctrl) < 0) + if (!restore_mode && virLXCControllerSetupUserns(ctrl) < 0) goto cleanup; =20 if (virLXCControllerMoveInterfaces(ctrl) < 0) @@ -2423,6 +2486,26 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (lxcControllerClearCapabilities() < 0) goto cleanup; =20 + if (restore_mode) { + int status; + int ret =3D waitpid(-1, &status, 0); + VIR_DEBUG("Got sig child %d", ret); + + /* There could be two cases here: + * 1. CRIU died bacause of restore error and the container is not = running + * 2. CRIU detached itself from the running container + */ + int initpid; + if ((initpid =3D lxcControllerFindRestoredPid(ctrl->restore)) < 0)= { + virReportSystemError(errno, "%s", + _("Unable to get restored task pid")); + virNetDaemonQuit(ctrl->daemon); + goto cleanup; + } + + ctrl->initpid =3D initpid; + } + for (i =3D 0; i < ctrl->nconsoles; i++) if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < = 0) goto cleanup; @@ -2466,6 +2549,7 @@ int main(int argc, char *argv[]) int ns_fd[VIR_LXC_DOMAIN_NAMESPACE_LAST]; int handshakeFd =3D -1; bool bg =3D false; + int restore =3D -1; const struct option options[] =3D { { "background", 0, NULL, 'b' }, { "name", 1, NULL, 'n' }, @@ -2477,6 +2561,7 @@ int main(int argc, char *argv[]) { "share-net", 1, NULL, 'N' }, { "share-ipc", 1, NULL, 'I' }, { "share-uts", 1, NULL, 'U' }, + { "restore", 1, NULL, 'r' }, { "help", 0, NULL, 'h' }, { 0, 0, 0, 0 }, }; @@ -2504,7 +2589,7 @@ int main(int argc, char *argv[]) while (1) { int c; =20 - c =3D getopt_long(argc, argv, "dn:v:p:m:c:s:h:S:N:I:U:", + c =3D getopt_long(argc, argv, "dn:v:p:m:c:s:h:S:N:I:U:r:", options, NULL); =20 if (c =3D=3D -1) @@ -2580,6 +2665,14 @@ int main(int argc, char *argv[]) securityDriver =3D optarg; break; =20 + case 'r': + if (virStrToLong_i(optarg, NULL, 10, &restore) < 0) { + fprintf(stderr, "malformed --restore argument '%s'", + optarg); + goto cleanup; + } + break; + case 'h': case '?': fprintf(stderr, "\n"); @@ -2596,6 +2689,7 @@ int main(int argc, char *argv[]) fprintf(stderr, " -N FD, --share-net FD\n"); fprintf(stderr, " -I FD, --share-ipc FD\n"); fprintf(stderr, " -U FD, --share-uts FD\n"); + fprintf(stderr, " -r FD, --restore FD\n"); fprintf(stderr, " -h, --help\n"); fprintf(stderr, "\n"); rc =3D 0; @@ -2648,6 +2742,8 @@ int main(int argc, char *argv[]) ctrl->passFDs =3D passFDs; ctrl->npassFDs =3D npassFDs; =20 + ctrl->restore =3D restore; + for (i =3D 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) { if (ns_fd[i] !=3D -1) { if (!ctrl->nsFDs) {/*allocate only once */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4f600f3df..f52085ebf 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1125,7 +1125,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, =20 ret =3D virLXCProcessStart(dom->conn, driver, vm, nfiles, files, - (flags & VIR_DOMAIN_START_AUTODESTROY), + (flags & VIR_DOMAIN_START_AUTODESTROY), -1, VIR_DOMAIN_RUNNING_BOOTED); =20 if (ret =3D=3D 0) { @@ -1252,7 +1252,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, =20 if (virLXCProcessStart(conn, driver, vm, nfiles, files, - (flags & VIR_DOMAIN_START_AUTODESTROY), + (flags & VIR_DOMAIN_START_AUTODESTROY), -1, VIR_DOMAIN_RUNNING_BOOTED) < 0) { virDomainAuditStart(vm, "booted", false); virLXCDomainObjEndJob(driver, vm); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 96041f2ec..1cd7f5bfe 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -118,7 +118,7 @@ virLXCProcessReboot(virLXCDriverPtr driver, virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); vm->newDef =3D savedDef; if (virLXCProcessStart(conn, driver, vm, - 0, NULL, autodestroy, reason) < 0) { + 0, NULL, autodestroy, -1, reason) < 0) { VIR_WARN("Unable to handle reboot of vm %s", vm->def->name); goto cleanup; @@ -914,7 +914,8 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, size_t nfiles, int handshakefd, int * const logfd, - const char *pidfile) + const char *pidfile, + int restorefd) { size_t i; char *filterstr; @@ -993,6 +994,12 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, for (i =3D 0; i < nveths; i++) virCommandAddArgList(cmd, "--veth", veths[i], NULL); =20 + if (restorefd !=3D -1) { + virCommandAddArg(cmd, "--restore"); + virCommandAddArgFormat(cmd, "%d", restorefd); + virCommandPassFD(cmd, restorefd, 0); + } + virCommandPassFD(cmd, handshakefd, 0); virCommandDaemonize(cmd); virCommandSetPidFile(cmd, pidfile); @@ -1166,6 +1173,8 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) * @driver: pointer to driver structure * @vm: pointer to virtual machine structure * @autoDestroy: mark the domain for auto destruction + * @restorefd: file descriptor pointing to the restore directory (-1 if not + * restoring) * @reason: reason for switching vm to running state * * Starts a vm @@ -1177,6 +1186,7 @@ int virLXCProcessStart(virConnectPtr conn, virDomainObjPtr vm, unsigned int nfiles, int *files, bool autoDestroy, + int restorefd, virDomainRunningReason reason) { int rc =3D -1, r; @@ -1386,7 +1396,7 @@ int virLXCProcessStart(virConnectPtr conn, files, nfiles, handshakefds[1], &logfd, - pidfile))) + pidfile, restorefd))) goto cleanup; =20 /* now that we know it is about to start call the hook if present */ @@ -1494,6 +1504,9 @@ int virLXCProcessStart(virConnectPtr conn, if (!priv->machineName) goto cleanup; =20 + if (restorefd !=3D -1) + goto skip_cgroup_checks; + /* We know the cgroup must exist by this synchronization * point so lets detect that first, since it gives us a * more reliable way to kill everything off if something @@ -1510,6 +1523,8 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } =20 + skip_cgroup_checks: + /* And we can get the first monitor connection now too */ if (!(priv->monitor =3D virLXCProcessConnectMonitor(driver, vm))) { /* Intentionally overwrite the real monitor error message, @@ -1596,7 +1611,7 @@ virLXCProcessAutostartDomain(virDomainObjPtr vm, if (vm->autostart && !virDomainObjIsActive(vm)) { ret =3D virLXCProcessStart(data->conn, data->driver, vm, - 0, NULL, false, + 0, NULL, false, -1, VIR_DOMAIN_RUNNING_BOOTED); virDomainAuditStart(vm, "booted", ret >=3D 0); if (ret < 0) { diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index d78cddef4..c724f31a7 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -29,6 +29,7 @@ int virLXCProcessStart(virConnectPtr conn, virDomainObjPtr vm, unsigned int nfiles, int *files, bool autoDestroy, + int restorefd, virDomainRunningReason reason); int virLXCProcessStop(virLXCDriverPtr driver, virDomainObjPtr vm, --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list