External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vz: acquire a pidfile in the driver root directory

Browse Source 
When we allow multiple instances of the driver for the same user
account, using a separate root directory, we need to ensure mutual
exclusion. Use a pidfile to guarantee this.

In privileged libvirtd this ends up locking

   /var/run/libvirt/vz/driver.pid

In unprivileged libvirtd this ends up locking

  /run/user/$UID/libvirt/vz/run/driver.pid

NB, the latter can vary depending on $XDG_RUNTIME_DIR

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-05-23 11:34:08 +01:00
parent 64c5b6bc06
commit 7cefe61172
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/vz/vz_driver.c
View File

@ -41,6 +41,7 @@
#include "vircommand.h" #include "vircommand.h"
#include "configmake.h" #include "configmake.h"
#include "virfile.h" #include "virfile.h"
#include "virpidfile.h"
#include "virstoragefile.h" #include "virstoragefile.h"
#include "virstring.h" #include "virstring.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -59,8 +60,13 @@ VIR_LOG_INIT("parallels.parallels_driver");
#define PRLCTL "prlctl" #define PRLCTL "prlctl"
#define VZ_STATEDIR LOCALSTATEDIR "/run/libvirt/vz"
static virClassPtr vzDriverClass; static virClassPtr vzDriverClass;
static bool vz_driver_privileged;
/* pid file FD, ensures two copies of the driver can't use the same root */
static int vz_driver_lock_fd = -1;
static virMutex vz_driver_lock; static virMutex vz_driver_lock;
static vzDriverPtr vz_driver; static vzDriverPtr vz_driver;
static vzConnPtr vz_conn_list; static vzConnPtr vz_conn_list;
@ -166,6 +172,11 @@ VIR_ONCE_GLOBAL_INIT(vzDriver);
vzDriverPtr vzDriverPtr
vzGetDriverConnection(void) vzGetDriverConnection(void)
{ {
if (!vz_driver_privileged) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("vz state driver is not active"));
return NULL;
}
virMutexLock(&vz_driver_lock); virMutexLock(&vz_driver_lock);
if (!vz_driver) if (!vz_driver)
vz_driver = vzDriverObjNew(); vz_driver = vzDriverObjNew();
@ -4090,18 +4101,37 @@ static virConnectDriver vzConnectDriver = {
static int static int
vzStateCleanup(void) vzStateCleanup(void)
{ {
virObjectUnref(vz_driver); if (vz_driver_privileged) {
vz_driver = NULL; virObjectUnref(vz_driver);
virMutexDestroy(&vz_driver_lock); vz_driver = NULL;
prlsdkDeinit(); if (vz_driver_lock_fd != -1)
virPidFileRelease(VZ_STATEDIR, "driver", vz_driver_lock_fd);
virMutexDestroy(&vz_driver_lock);
prlsdkDeinit();
}
return 0; return 0;
} }
static int static int
vzStateInitialize(bool privileged ATTRIBUTE_UNUSED, vzStateInitialize(bool privileged,
virStateInhibitCallback callback ATTRIBUTE_UNUSED, virStateInhibitCallback callback ATTRIBUTE_UNUSED,
void *opaque ATTRIBUTE_UNUSED) void *opaque ATTRIBUTE_UNUSED)
{ {
if (!privileged)
return 0;
vz_driver_privileged = privileged;
if (virFileMakePathWithMode(VZ_STATEDIR, S_IRWXU) < 0) {
virReportSystemError(errno, _("cannot create state directory '%s'"),
VZ_STATEDIR);
return -1;
}
if ((vz_driver_lock_fd =
virPidFileAcquire(VZ_STATEDIR, "driver", true, getpid())) < 0)
return -1;
if (prlsdkInit() < 0) { if (prlsdkInit() < 0) {
VIR_DEBUG("%s", _("Can't initialize Parallels SDK")); VIR_DEBUG("%s", _("Can't initialize Parallels SDK"));
return -1; return -1;