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 DFA2B1FF165 for ; Thu, 31 Jul 2025 10:28:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A773035DB9; Thu, 31 Jul 2025 10:29:31 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 31 Jul 2025 10:28:47 +0200 Message-ID: <20250731082847.1113092-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753950526361 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 proxmox-rrd-migration-tool] fix failure during migration when there are no guest metrics yet 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" If a node never has had any guests on it, the pve2-vm directory does not exist yet, which led to a failure when attempting to read the contents of this directory. This is fixed by explicitly checking for a 'not found' error (we still want to fail for other kinds of errors). Signed-off-by: Lukas Wagner --- src/main.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 6fcdc10..fb58d3a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,6 +2,7 @@ use anyhow::{bail, Error, Result}; use std::{ ffi::{CStr, CString, OsString}, fs, + io::ErrorKind, os::unix::{ffi::OsStrExt, fs::PermissionsExt}, path::{Path, PathBuf}, sync::Arc, @@ -319,7 +320,15 @@ fn mv_old(file: &str) -> Result<()> { fn collect_rrd_files(location: &PathBuf) -> Result> { let mut files: Vec<(CString, OsString)> = Vec::new(); - fs::read_dir(location)? + let contents = match fs::read_dir(location) { + Ok(contents) => contents, + Err(e) if e.kind() == ErrorKind::NotFound => { + return Ok(files); + } + Err(e) => return Err(e.into()), + }; + + contents .filter(|f| f.is_ok()) .map(|f| f.unwrap().path()) .filter(|f| f.is_file() && f.extension().is_none()) @@ -409,6 +418,11 @@ fn migrate_guests( let guest_source_files = collect_rrd_files(&source_dir_guests)?; + if guest_source_files.is_empty() { + println!("No guest metrics to migrate"); + return Ok(()); + } + if !target_dir_guests.exists() && migrate { println!("Creating new directory: '{}'", target_dir_guests.display()); std::fs::create_dir(&target_dir_guests)?; -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel