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 7F9031FF180 for ; Fri, 1 Aug 2025 14:09:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2668B1855A; Fri, 1 Aug 2025 14:11:03 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 1 Aug 2025 14:10:26 +0200 Message-ID: <20250801121029.201766-3-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250801121029.201766-1-s.hanreich@proxmox.com> References: <20250801121029.201766-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.195 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods 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. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pve8to9.pm] Subject: [pve-devel] [PATCH pve-manager 1/1] pve8to9: check for legacy ipam db or mac cache files 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" Check if there are any not-yet-migrated ipam / mac cache files in pmxcfs. Those should have been migrated over in the pve-network postinst, but if something went wrong during this process we can explicitly notify users here again to avoid any unpleasant suprises after the upgrade. If all nodes are on PVE 9, it is safe to delete the legacy files, print a notice informing the users. Signed-off-by: Stefan Hanreich --- PVE/CLI/pve8to9.pm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm index 834432b95..5f7c21af9 100644 --- a/PVE/CLI/pve8to9.pm +++ b/PVE/CLI/pve8to9.pm @@ -2016,6 +2016,48 @@ sub check_virtual_guests { check_qemu_machine_versions(); } +my $LEGACY_IPAM_DB = "/etc/pve/priv/ipam.db"; +my $NEW_IPAM_DB = "/etc/pve/sdn/pve-ipam-state.json"; + +my $LEGACY_MAC_DB = "/etc/pve/priv/macs.db"; +my $NEW_MAC_DB = "/etc/pve/sdn/mac-cache.json"; + +sub check_legacy_ipam_files { + log_info("Checking for IPAM DB files that have not yet been migrated."); + + if (-e $LEGACY_IPAM_DB) { + if (-e $NEW_IPAM_DB) { + log_notice( + "Found leftover legacy IPAM DB file in $LEGACY_IPAM_DB.\n" + . "This file can be deleted AFTER upgrading ALL nodes to PVE 9." + ); + } else { + log_fail( + "Found IPAM DB file in $LEGACY_IPAM_DB that has not been migrated!\n" + . "File needs to be migrated to $NEW_IPAM_DB before upgrading. Update pve-network to the newest version." + ); + } + } else { + log_pass("No legacy IPAM DB found."); + } + + if (-e $LEGACY_MAC_DB) { + if (-e $NEW_MAC_DB) { + log_notice( + "Found leftover legacy MAC DB file in $LEGACY_MAC_DB.\n" + . "This file can be deleted AFTER upgrading ALL nodes to PVE 9." + ); + } else { + log_fail( + "Found MAC DB file in $LEGACY_MAC_DB that has not been migrated!\n" + . "File needs to be migrated to $NEW_MAC_DB before upgrading. Update pve-network to the newest version." + ); + } + } else { + log_pass("No legacy MAC DB found."); + } +} + sub check_misc { print_header("MISCELLANEOUS CHECKS"); my $ssh_config = eval { PVE::Tools::file_get_contents('/root/.ssh/config') }; @@ -2110,6 +2152,7 @@ sub check_misc { check_legacy_backup_job_options(); check_lvm_autoactivation(); check_rrd_migration(); + check_legacy_ipam_files(); } my sub colored_if { -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel