From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id A60681FF162
for <inbox@lore.proxmox.com>; Sat, 22 Mar 2025 16:31:07 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 3ACC63C4FE;
Sat, 22 Mar 2025 16:31:01 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Sun, 23 Mar 2025 00:17:18 +0900
In-Reply-To: <20250322152004.1646886-1-jing@jing.rocks>
References: <20250322152004.1646886-1-jing@jing.rocks>
MIME-Version: 1.0
Message-ID: <mailman.91.1742657459.359.pve-devel@lists.proxmox.com>
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Post: <mailto:pve-devel@lists.proxmox.com>
From: Jing Luo via pve-devel <pve-devel@lists.proxmox.com>
Precedence: list
Cc: Jing Luo <jing@jing.rocks>
X-Mailman-Version: 2.1.29
X-BeenThere: pve-devel@lists.proxmox.com
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
Subject: [pve-devel] [PATCH pve-storage] tree-wide: change /var/lock to
/run/lock
Content-Type: multipart/mixed; boundary="===============6250143204713941363=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
--===============6250143204713941363==
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <jing@jing.rocks>
X-Original-To: pve-devel@lists.proxmox.com
Delivered-To: pve-devel@lists.proxmox.com
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 6FDC1C942F
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:59 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 53A1F3C1FA
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:29 +0100 (CET)
Received: from mail-gw3.jing.rocks (mail-gw3.jing.rocks [219.117.250.209])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:28 +0100 (CET)
Received: from mail-gw3.jing.rocks (localhost [127.0.0.1])
by mail-gw3.jing.rocks (Proxmox) with ESMTP id AE5A4164F2
for <pve-devel@lists.proxmox.com>; Sun, 23 Mar 2025 00:20:22 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jing.rocks; h=cc
:cc:content-transfer-encoding:date:from:from:in-reply-to
:message-id:mime-version:references:reply-to:subject:subject:to
:to; s=mail-gw; bh=8IXLDjMrTyP6x7DdUIxkdVwlct9ExC99wgxFGt8PpQs=; b=
I/51uLWctqf2WoGq0YphcLL7P8oQG2I6Rx06kQso4vRQPvjMq3VzHyJRXqOQabgd
4i0apYapup52QtgGYXEOLgQTCrw0RF3+kBnHmo/nYIhxihAfR1nsOn0z2jSowgXf
EsydDLSOgbzVPyeKTCrcYp8xnAwuEbbDx18iu64Tor85V43cdYw/ppIYuJsH6ThK
g73xSfw0GERWtejPeY44XPnAb+K73kQKLMCSfBdP+2P+mmOpTzqetKSekL0Hqaid
OmBIOr9gMjazjxF0qxDxh8zeCnZzuEQaQy0kZldT4fnbEaZ/zsh8QPPp4mvvayD0
H8poHkEvLccHl4wiucxKhg==
Received: from mail.jing.rocks (mail.jing.rocks [IPv6:240b:10:f00:1b00::222])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by mail-gw3.jing.rocks (Proxmox) with ESMTPS id 19CD6165EB
for <pve-devel@lists.proxmox.com>; Sun, 23 Mar 2025 00:20:22 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jing.rocks;
s=default; t=1742656822;
bh=xnAwMgER3lOURHRkfCt4LHZ6fdlHKxP/tjK9Plj3Y00=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=gk0ukhK3e1xPPrraO9YwVNp9x94fKDxdbaax/oDkxc2tORG8Jopi07hP+jXTu8NrX
TDPboceLHzYsjiFloKblgNbHFqXRv1yjrO996eP4plWvzo6gzVlJNNlU3ExqZMPRpH
YnVl/a3NADi3cFwQ4EgLzNG+mIwQuCz9NeAbF7VHNuFIqhuODwEwKYiLYQkRa6SVU/
mygVRTL1RjFHR9dfc0SJ2bDQ9webq+dox/Hsv5xP2QbOefj1wNc4cwKQcRNEAde/1k
Wr0O4BcVBHUzlwe+sUIKthXY+l89n3eYq/zEnZTbTs1iT3cCD5a5aEfISaZBD4jTNd
dgwvCn2wHayLw==
Received: from X570AM.jing.rocks (X570AM.lan [IPv6:240b:10:f00:1b00::7e82])
(Authenticated sender: jing@jing.rocks)
by mail.jing.rocks (Postfix) with ESMTPSA id 12D2C37F45;
Sun, 23 Mar 2025 00:20:22 +0900 (JST)
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH pve-storage] tree-wide: change /var/lock to /run/lock
Date: Sun, 23 Mar 2025 00:17:18 +0900
Message-ID: <20250322152004.1646886-11-jing@jing.rocks>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250322152004.1646886-1-jing@jing.rocks>
References: <20250322152004.1646886-1-jing@jing.rocks>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.000 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid
DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature
DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain
DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain
DMARC_PASS -0.1 DMARC pass policy
KAM_INFOUSMEBIZ 0.75 Prevalent use of .info|.us|.me|.me.uk|.biz|xyz|id|rocks|life domains in spam/malware
KAM_OTHER_BAD_TLD 0.75 Other untrustworthy TLDs
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Let's use /run/lock for lock files. Also, pve-iscsi-rescan.lock doesn't
seem to be used by any other package. "/var/lock" is deprecated.
Signed-off-by: Jing Luo <jing@jing.rocks>
---
src/PVE/Storage/ISCSIPlugin.pm | 2 +-
src/PVE/Storage/Plugin.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index eb70453..49114a8 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -159,7 +159,7 @@ sub iscsi_logout {
run_command([$ISCSIADM, '--mode', 'node', '--targetname', $target, '--logout']);
}
-my $rescan_filename = "/var/run/pve-iscsi-rescan.lock";
+my $rescan_filename = "/run/lock/pve-iscsi-rescan.lock";
sub iscsi_session_rescan {
my $session_list = shift;
diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 65cf43f..0c8f7d0 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -617,7 +617,7 @@ sub cluster_lock_storage {
my $res;
if (!$shared) {
my $lockid = "pve-storage-$storeid";
- my $lockdir = "/var/lock/pve-manager";
+ my $lockdir = "/run/lock/pve-manager";
mkdir $lockdir;
$res = PVE::Tools::lock_file("$lockdir/$lockid", $timeout, $func, @param);
die $@ if $@;
--
2.49.0
--===============6250143204713941363==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
--===============6250143204713941363==--