From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 396011FF2C5 for ; Mon, 8 Jul 2024 16:16:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ADC017E66; Mon, 8 Jul 2024 16:16:26 +0200 (CEST) Message-ID: Date: Mon, 8 Jul 2024 16:16:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Proxmox VE development discussion , Christoph Heiss References: <20240516102837.422278-1-c.heiss@proxmox.com> <20240516102837.422278-4-c.heiss@proxmox.com> From: Aaron Lauterer In-Reply-To: <20240516102837.422278-4-c.heiss@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.040 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: Re: [pve-devel] [PATCH installer 3/3] low-level: install: check for already-existing `rpool` on install 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On 2024-05-16 12:28, Christoph Heiss wrote: > .. in the same manner as the detection for LVM works. > > zpools can only be renamed by importing them with a new name, so > unfortunaly the import-export dance is needed. > > Signed-off-by: Christoph Heiss > --- > Proxmox/Install.pm | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm > index c86a574..531ef1c 100644 > --- a/Proxmox/Install.pm > +++ b/Proxmox/Install.pm > @@ -16,6 +16,7 @@ use Proxmox::Install::StorageConfig; > use Proxmox::Sys::Block qw(get_cached_disks wipe_disk partition_bootable_disk); > use Proxmox::Sys::Command qw(run_command syscmd); > use Proxmox::Sys::File qw(file_read_firstline file_write_all); > +use Proxmox::Sys::ZFS; > use Proxmox::UI; > > # TODO: move somewhere better? > @@ -176,9 +177,41 @@ sub random_short_uid { > return sprintf "%08X", rand(0xffffffff); > } > > +sub zfs_ask_existing_zpool_rename { > + my ($pool_name) = @_; > + > + # At this point, no pools should be imported/active > + my $exported_pools = Proxmox::Sys::ZFS::get_exported_pools(); > + > + foreach (@$exported_pools) { > + next if $_->{name} ne $pool_name || $_->{state} ne 'ONLINE'; > + my $renamed_pool = "$_->{name}-OLD-" . random_short_uid(); since the pool already has a unigue numerical id, couln't we use that instead of generating a new one? we even have everything in place with $_->{id}. > + > + my $response_ok = Proxmox::UI::prompt( > + "A ZFS pool named '$_->{name}' (id $_->{id}) already exists on the system.\n\n" . > + "Do you want to rename the pool to '$renamed_pool' before continuing\n" . > + "or cancel the installation?" > + ); > + > + # Import the pool using its id, as that is unique and works even if there are > + # multiple zpools with the same name. > + if ($response_ok) { > + syscmd("zpool import -f $_->{id} $renamed_pool") == 0 || > + die "failed to import zfs pool '$_->{name}' with new name '$renamed_pool'\n"; > + syscmd("zpool export $renamed_pool") == 0 || > + warn "failed to export renamed zfs pool '$renamed_pool'\n"; > + } else { > + warn "Canceled installation as requested by user, due to already existing ZFS pool '$pool_name'\n"; > + die "\n"; # causes abort without re-showing an error dialogue > + } > + } > +} > + > sub zfs_create_rpool { > my ($vdev, $pool_name, $root_volume_name) = @_; > > + zfs_ask_existing_zpool_rename($pool_name); > + > my $iso_env = Proxmox::Install::ISOEnv::get(); > > my $zfs_opts = Proxmox::Install::Config::get_zfs_opt(); _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel