From nobody Sat Feb 7 14:16:32 2026 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562773679; cv=none; d=zoho.com; s=zohoarc; b=Q+rHCPHX9zuySH2IwrKU2YGtogfQ9FmcmXftGhPngQmnOvtttEGzT4oVZWJh2+2AWpZvWrEl65plCLAFmej/LvnNuATYVkW4MnYGZXT4og4xmLpzz8eNGrNj8y5KGASu63IJaxZnZdph4d7EBmnjYneyZg6ux0xu2MaTQtK6j9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562773679; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=voTYYHwC2nj+pKjmZdVciRZwfzWnYZeKEikaDDCpubM=; b=CSgZh35rA9GPyEwyDmfiLqy9IrZV6+I+10eok7/jUqtL7pcD3N5qgnftGuzNXijbexQ2IVgeMsnnhHXlyLzESDaBN//PPRDn2KMK2ZwoD/0BOH2tROVV+ARnz9wibCEKnZ7tr4eDnfJPOqzff26v8GnuOZIbr9nrliUWfsNtw6A= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1562773679747591.9522600515301; Wed, 10 Jul 2019 08:47:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B25530C1333; Wed, 10 Jul 2019 15:47:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E270460603; Wed, 10 Jul 2019 15:47:57 +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 A6B3018433A4; Wed, 10 Jul 2019 15:47:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6AFltkq017794 for ; Wed, 10 Jul 2019 11:47:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD5F21001DD9; Wed, 10 Jul 2019 15:47:55 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9430E1001DCF; Wed, 10 Jul 2019 15:47:54 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 10 Jul 2019 16:47:33 +0100 Message-Id: <20190710154741.17065-5-berrange@redhat.com> In-Reply-To: <20190710154741.17065-1-berrange@redhat.com> References: <20190710154741.17065-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/12] storage: acquire a pidfile in the driver root directory 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: , Content-Type: text/plain; charset="utf-8" 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 10 Jul 2019 15:47:58 +0000 (UTC) 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/storage/driver.pid In unprivileged libvirtd this ends up locking /run/user/$UID/libvirt/storage/run/driver.pid NB, the latter can vary depending on $XDG_RUNTIME_DIR Signed-off-by: Daniel P. Berrang=C3=A9 --- src/conf/virstorageobj.h | 3 +++ src/storage/storage_driver.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 92d229f9b4..4547a0df9b 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -37,6 +37,9 @@ typedef virStorageDriverState *virStorageDriverStatePtr; struct _virStorageDriverState { virMutex lock; =20 + /* pid file FD, ensures two copies of the driver can't use the same ro= ot */ + int lockFD; + virStoragePoolObjListPtr pools; =20 char *configDir; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 496d51b1e0..03ac6a6845 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -43,6 +43,7 @@ #include "virlog.h" #include "virfile.h" #include "virfdstream.h" +#include "virpidfile.h" #include "configmake.h" #include "virsecret.h" #include "virstring.h" @@ -256,6 +257,7 @@ storageStateInitialize(bool privileged, if (VIR_ALLOC(driver) < 0) return -1; =20 + driver->lockFD =3D -1; if (virMutexInit(&driver->lock) < 0) { VIR_FREE(driver); return -1; @@ -296,6 +298,11 @@ storageStateInitialize(bool privileged, goto error; } =20 + if ((driver->lockFD =3D + virPidFileAcquire(driver->stateDir, "driver", + true, getpid())) < 0) + goto error; + if (virStoragePoolObjLoadAllState(driver->pools, driver->stateDir) < 0) goto error; @@ -371,6 +378,10 @@ storageStateCleanup(void) /* free inactive pools */ virObjectUnref(driver->pools); =20 + if (driver->lockFD !=3D -1) + virPidFileRelease(driver->stateDir, "driver", + driver->lockFD); + VIR_FREE(driver->configDir); VIR_FREE(driver->autostartDir); VIR_FREE(driver->stateDir); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list