From nobody Sun May 5 01:06:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1625095112976391.68082724031524; Wed, 30 Jun 2021 16:18:32 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-595-BrI0nipxMQm9MY5sPJ3iEQ-1; Wed, 30 Jun 2021 19:18:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C2B4100C611; Wed, 30 Jun 2021 23:18:23 +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 0372C19D9B; Wed, 30 Jun 2021 23:18:20 +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 64B8E1809C99; Wed, 30 Jun 2021 23:18:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15UNIDRU029904 for ; Wed, 30 Jun 2021 19:18:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 112AD100332F; Wed, 30 Jun 2021 23:18:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C4D1100321C for ; Wed, 30 Jun 2021 23:18:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 50B9A185A794 for ; Wed, 30 Jun 2021 23:18:09 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-360-XWZcdWOaPoaYWGGNV4vFiw-1; Wed, 30 Jun 2021 19:18:07 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-6-rO1TlyyYNnOlWsybwrpJ-w-1; Thu, 01 Jul 2021 01:18:04 +0200 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM8PR04MB7364.eurprd04.prod.outlook.com (2603:10a6:20b:1db::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Wed, 30 Jun 2021 23:18:02 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::a835:c9e1:adaf:572c]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::a835:c9e1:adaf:572c%7]) with mapi id 15.20.4287.023; Wed, 30 Jun 2021 23:18:02 +0000 Received: from localhost (192.225.177.165) by AM0PR04CA0003.eurprd04.prod.outlook.com (2603:10a6:208:122::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 23:18:01 +0000 X-MC-Unique: BrI0nipxMQm9MY5sPJ3iEQ-1 X-MC-Unique: XWZcdWOaPoaYWGGNV4vFiw-1 X-MC-Unique: rO1TlyyYNnOlWsybwrpJ-w-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH] virtlockd: Don't report error if lockspace exists Date: Wed, 30 Jun 2021 17:17:58 -0600 Message-ID: <20210630231758.22927-1-jfehlig@suse.com> X-Originating-IP: [192.225.177.165] X-ClientProxiedBy: AM0PR04CA0003.eurprd04.prod.outlook.com (2603:10a6:208:122::16) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21014628-ffed-43a9-3de8-08d93c1d4ec3 X-MS-TrafficTypeDiagnostic: AM8PR04MB7364: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 3MVQuEqa1EUNpIA/OsWW25QnGhSy3Si3j5HHnDicTG2XgXLOKLE4IJLbQVuaF5gOcLRDVsKQCU0S1QonCf6ON+6BIrsYvGXB4H9mAvVl/MCPVMR7acs2j+bIZelsSXrVSOBiyV8dmEJCNmFipv6HpBNQF9M5d1XEXalLBfleJwFMNvRWDs+pIEHUW5JoCdAHzRpeowcvSYPaEOVPqhh0wqENRV4nV0lBZPJObc0nsp2iXpi0F8rzTbe/rpEoutvENnwsw8m/wv3XMRb5EJ0zVHYySPkIAkdizo02VmJh1+rC8cdZWEShkf5qTRk0E20BWTxHAqTzwolDwv4Bhh2W2a1FCZV0S2cRtsuftshbHccRQd66K8Ns7us0HrqxDxwKi7d3OqFPEqsZNDQkM3omXdqetyxHEyOV9tp1xPQoShhsr1YBDL1IxMzxBI+ES0rUOoSw4BHPsp9fczh8IhWLfKgdcxVyxKkwY9P7lwFFxiiIdLBgiIrIBBoRNDGADPJRdx2opOZR5zSO3dxKDpRcIm6BGz4I5yb7IevtLt+bp3tHmXZCzEJjcQw2IB8anfqrnIFG+8FcM4mA8JJk7CshBduMAsRgKBji010mPGeyf9QoEGvVcUAJ6VDWYiupT8sY6E7u5aWve3Nm6fwvPlb47h+VzxAdKtLQqRpS6UmGZ3wkfEmdgNqhrFpRve4+dVBfJHNuPTaL232jVbVeceXstU78PI+BoRcgSF1Ehf3R9qIMr5C5woxf4PhFnKpDXGIh X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(366004)(39860400002)(396003)(376002)(346002)(5660300002)(6496006)(6666004)(8936002)(956004)(38100700002)(2616005)(16526019)(8676002)(316002)(36756003)(26005)(186003)(1076003)(6486002)(83380400001)(6916009)(86362001)(66556008)(66476007)(2906002)(66946007)(478600001)(966005); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gY3L0Kyfcv70Fo81j5ii7nLsG70FU0OgZEcESn+bue+L1NVS6sYc+5libDzY?= =?us-ascii?Q?Xc+QKKEhabEdTSNzilDqrrOeaU4aeGXRRkOfpru4pNvNOEWbMfJmqoB8hwUY?= =?us-ascii?Q?LtpX3sZMAZ+n0SRSL+X9g63/CZ+EdmSNYil3uhCgAGrwfvL7MnxdyyKyUeI5?= =?us-ascii?Q?WloL74ekKQmoMg09gtHBpzyRbPOMLfqRCkVxF8rJcFuRJfuuKw3fZ78veNZ/?= =?us-ascii?Q?lIz5S1zccaab+2H1Y6D4MSiemxgQU9lNCHTHUE2IHMQP1F4hbV1O5aCBbwZk?= =?us-ascii?Q?GlUDPLyGNgwFZzB3aETeHOmW38eQzyQfTNc0KPDobZR9YHRR2Jw2kzewKtUS?= =?us-ascii?Q?wn9cmtrnEs8YiolQ2Xse/xU1eXGuto0pZLIZbRQdSdrLh6W1MjWZJEXEOM7d?= =?us-ascii?Q?eD6WT9XY4vQECLbmdCXXUh5Xyd8ylVTzm3RzRKUIVgZAjEYNnvXCixJTe/t/?= =?us-ascii?Q?gnas3gmtTujpx0Zt9O0Q7A3YMLmpeZY7P8K+bfkf0Y49ADyb29jcJM1DQYDl?= =?us-ascii?Q?6qS0QY4MluUDXgj/tYHwD9VKICTb78zRLKw7MNsz0meZUhGf1a5yo+manjMu?= =?us-ascii?Q?24DurieFi9mlGQ+wdBcgGsEDLpFe4vmBya8gjiO/1Oeiig213Y+DNGxtBOV4?= =?us-ascii?Q?iGHHQVdB5dpa+PLKSWSTkeVtb/rMHA12o9f/it192Ra65AUP0TZeWIq38h1w?= =?us-ascii?Q?XqZ/NZtBtpL9Xiv2i5thXG6dUnbWtcVzTfVBFVqKnPxMpNMqEJ8owiqE6sG5?= =?us-ascii?Q?BkIXiwi/FN92wHc+xaDejuCk5kS/BMFN+TPVgx/pqSWNm+u9keuNWeWq84Wf?= =?us-ascii?Q?9xlPT/u+bnXMBB5AFP62SU6yzrHDp7IqJrvH0VdjiPCbGWuVTM6ELhkR3KgW?= =?us-ascii?Q?qVDAHkBG4ofXfC3JV+AIkSPTtavx94atvnRIG8HfBkb6XlVQeGIWsXShN9fm?= =?us-ascii?Q?DTQ7ZkV2LT92xX/OPT92OrY9tXxmrSSuvalteIapX4nTs1GnvXL4yNyWG/W0?= =?us-ascii?Q?kN7tcv8/09LfdpeS3T7rcHG46Pnjzq1tiY7RUYz8z23B3wO8jZF+9WipkBn3?= =?us-ascii?Q?F39YbV6iYhdQISHSSsF+iR2Eb8n52PSvqM5amm1i7t6QqpH7oBbToXX7Q5YW?= =?us-ascii?Q?RVl4EoE0OWUqFXLWknsCoDDZuLMOUUKYc97zMeSfynQk5/pMD5WLRoWeDS5g?= =?us-ascii?Q?YI+GdrlL26GmGp9zsPEi7aTsfYLXr0QOP7F7VgTRW2iX0gMofp8SWJp1iqVB?= =?us-ascii?Q?KKfduCpA+clf5c++BnyrnGdy2kybMaTFclb7IXnTz5iAmuM422DydRM1yy4a?= =?us-ascii?Q?myd3vcgkOhGTiTLb5tNP6dGf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21014628-ffed-43a9-3de8-08d93c1d4ec3 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 23:18:02.4006 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VvCMpQZU3BxmGiOgYERbemrytE4oI3rSdOlXvsPN+SBX8SYFYrIUQ5hkS4x92c1fIACUPOTqeJwNMLMEwjwnCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7364 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15UNIDRU029904 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When the qemu or libxl driver is configured to use lockd and file_lockspace_dir is set, virtlockd emits an error when libvirtd is retarted May 25 15:44:31 virt81 virtlockd[7723]: Requested operation is not valid: Lockspace for path /data/libvirtd/lockspace already exists There is really no need to fail when the lockspace already exists, paricularly since the user is expected to create the lockspace specified in file_lockspace_dir. Failure to do so will prevent starting any domains virsh start test error: Failed to start domain 'test' error: Unable to open/create resource /data/libvirtd/lockspace/de22c4bf931e= 7c48b49e8ca64b477d44e78a51543e534df488b05ccd08ec5caa: No such file or direc= tory Also, virLockManagerLockDaemonSetupLockspace already has logic to ignore the error. Since callers are not interested in the error, change virtlockd to not report or return an error when the specified lockspace already exists. Signed-off-by: Jim Fehlig Reviewed-by: Daniel Henrique Barboza --- In response to my earlier query about this problem https://listman.redhat.com/archives/libvir-list/2021-May/msg00872.html src/locking/lock_daemon_dispatch.c | 5 ++--- src/locking/lock_driver_lockd.c | 11 ++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_d= ispatch.c index e8b9832453..13e688f2e2 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -405,9 +405,8 @@ virLockSpaceProtocolDispatchCreateLockSpace(virNetServe= r *server G_GNUC_UNUSED, } =20 if (virLockDaemonFindLockSpace(lockDaemon, args->path) !=3D NULL) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Lockspace for path %s already exists"), - args->path); + VIR_DEBUG("Lockspace for path %s already exists", args->path); + rv =3D 0; goto cleanup; } =20 diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 3a7386af30..87afdbfb78 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -281,15 +281,8 @@ static int virLockManagerLockDaemonSetupLockspace(cons= t char *path) VIR_LOCK_SPACE_PROTOCOL_PROC_CREATE_LOCKSP= ACE, 0, NULL, NULL, NULL, (xdrproc_t)xdr_virLockSpaceProtocolCreateL= ockSpaceArgs, (char*)&args, - (xdrproc_t)xdr_void, NULL) < 0) { - if (virGetLastErrorCode() =3D=3D VIR_ERR_OPERATION_INVALID) { - /* The lockspace already exists */ - virResetLastError(); - rv =3D 0; - } else { - goto cleanup; - } - } + (xdrproc_t)xdr_void, NULL) < 0) + goto cleanup; =20 rv =3D 0; =20 --=20 2.31.1