[pve-devel] [PATCH installer v3 4/4] low-level: install: check for already-existing `rpool` on install
Aaron Lauterer
a.lauterer at proxmox.com
Fri Jul 12 11:36:56 CEST 2024
only one small nit inline
On 2024-07-11 13:57, Christoph Heiss wrote:
> .. much in the same manner as the detection for LVM works.
>
> zpools can only be renamed by importing them with a new name, so
> unfortunately the import-export dance is needed.
>
> Signed-off-by: Christoph Heiss <c.heiss at proxmox.com>
> ---
> Changes v2 -> v3:
> * skip rename prompt in auto-install mode
>
> Changes v1 -> v2:
> * use unique pool id for renaming instead of generating random id
> ourselves
> * moved renaming functionality to own subroutine in new
> Proxmox::Sys::ZFS module
>
> Proxmox/Install.pm | 33 +++++++++++++++++++++++++++++++++
> Proxmox/Sys/ZFS.pm | 20 ++++++++++++++++++--
> 2 files changed, 51 insertions(+), 2 deletions(-)
>
> diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
> index 7342e4b..ba699fa 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?
> @@ -169,9 +170,41 @@ sub btrfs_create {
> syscmd($cmd);
> }
>
> +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-$_->{id}";
> +
> + my $response_ok = Proxmox::Install::Config::get_existing_storage_auto_rename();
maybe we want to name this differently to avoid confusion?
response_ok -> do_rename
or something in that regard?
but that could be done in a follow up patch as well if we want to
> + if (!$response_ok) {
> + $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 " .
> + "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) {
> + Proxmox::Sys::ZFS::rename_pool($_->{id}, $renamed_pool);
> + } 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
> + }
> + }
> +}
> +
[...]
More information about the pve-devel
mailing list