From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id C8E261FF17C for ; Wed, 9 Jul 2025 13:22:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BDF868A97; Wed, 9 Jul 2025 13:23:12 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 9 Jul 2025 13:22:53 +0200 Message-Id: <20250709112309.2299797-4-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250709112309.2299797-1-a.lauterer@proxmox.com> References: <20250709112309.2299797-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH cluster 1/3] cfs status.c: drop old pve2-vm rrd schema support X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" the newer pve2.3-vm schema has been introduced with commit ba9dcfc1 back in 2013. By now there should be no cluster where an older node might still send the old pve2-vm schema. Signed-off-by: Aaron Lauterer --- src/pmxcfs/status.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/pmxcfs/status.c b/src/pmxcfs/status.c index cda3921..77a18d8 100644 --- a/src/pmxcfs/status.c +++ b/src/pmxcfs/status.c @@ -1277,17 +1277,10 @@ update_rrd_data( create_rrd_file(filename, argcount, rrd_def_node); } - } else if ((strncmp(key, "pve2-vm/", 8) == 0) || - (strncmp(key, "pve2.3-vm/", 10) == 0)) { - const char *vmid; + } else if (strncmp(key, "pve2.3-vm/", 10) == 0) { + const char *vmid = key + 10; - if (strncmp(key, "pve2-vm/", 8) == 0) { - vmid = key + 8; - skip = 2; - } else { - vmid = key + 10; - skip = 4; - } + skip = 4; if (strchr(vmid, '/') != NULL) goto keyerror; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel