[pve-devel] [PATCH cluster-pve8 1/2] cfs status.c: drop old pve2-vm rrd schema support

[Aaron Lauterer <a.lauterer@proxmox.com>]

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 <a.lauterer@proxmox.com>
---
 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