From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 30BEB7C699 for ; Fri, 5 Nov 2021 11:29:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 26C63A748 for ; Fri, 5 Nov 2021 11:29:51 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EA241A73F for ; Fri, 5 Nov 2021 11:29:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C2C0845BBC for ; Fri, 5 Nov 2021 11:29:49 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 5 Nov 2021 11:29:45 +0100 Message-Id: <20211105102945.185988-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211105102945.185988-1-f.ebner@proxmox.com> References: <20211105102945.185988-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.232 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pve-devel] [PATCH storage 2/2] lvm thin: don't assume that a thin pool and its volumes are active 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: , X-List-Received-Date: Fri, 05 Nov 2021 10:29:51 -0000 There are cases where autoactivation can fail, as reported in the community forum [0]. And it could also be that a volume was deactivated by something outside of our control. It doesn't seem strictly necessary to activate the thin pool itself (creating/removing/activating LVs within the pool still works if it's not active), but it does not report usage information as long as neither the pool nor any of its LVs are active. Activate the pool for that, for being able to use the flag in status(), and it should also serve as a good indicator that there's a problem with the pool if it can't be activated. Before activating, check the (cached) lv_state from lvm_list_volumes. It's necessary to update the cache in activate_storage, because the flag is re-used in status(). Also update it for other (de)activations to be more future-proof. [0]: https://forum.proxmox.com/threads/local-lvm-not-available-after-kernel-update-on-pve-7.97406 Signed-off-by: Fabian Ebner --- PVE/Storage/LVMPlugin.pm | 1 + PVE/Storage/LvmThinPlugin.pm | 64 +++++++++++++++++++++++------------- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/PVE/Storage/LVMPlugin.pm b/PVE/Storage/LVMPlugin.pm index 139d391..b44aeb8 100644 --- a/PVE/Storage/LVMPlugin.pm +++ b/PVE/Storage/LVMPlugin.pm @@ -173,6 +173,7 @@ sub lvm_list_volumes { my $d = { lv_size => int($lv_size), + lv_state => substr($lv_attr, 4, 1), lv_type => $lv_type, }; $d->{pool_lv} = $pool_lv if $pool_lv; diff --git a/PVE/Storage/LvmThinPlugin.pm b/PVE/Storage/LvmThinPlugin.pm index 34e57b2..ea7b9b3 100644 --- a/PVE/Storage/LvmThinPlugin.pm +++ b/PVE/Storage/LvmThinPlugin.pm @@ -202,43 +202,61 @@ sub status { return if !$info || $info->{lv_type} ne 't' || !$info->{lv_size}; - return ($info->{lv_size}, $info->{lv_size} - $info->{used}, $info->{used}, 1); + return ( + $info->{lv_size}, + $info->{lv_size} - $info->{used}, + $info->{used}, + $info->{lv_state} eq 'a' ? 1 : 0, + ); +} + +my $activate_lv = sub { + my ($vg, $lv, $cache) = @_; + + my $lvs = $cache->{lvs} ||= PVE::Storage::LVMPlugin::lvm_list_volumes(); + + die "no such logical volume $vg/$lv" if !$lvs->{$vg} || !$lvs->{$vg}->{$lv}; + + return if $lvs->{$vg}->{$lv}->{lv_state} eq 'a'; + + run_command(['lvchange', '-ay', '-K', "$vg/$lv"], errmsg => "activating LV '$vg/$lv' failed"); + + $lvs->{$vg}->{$lv}->{lv_state} = 'a'; # update cache + + return; +}; + +sub activate_storage { + my ($class, $storeid, $scfg, $cache) = @_; + + $class->SUPER::activate_storage($storeid, $scfg, $cache); + + $activate_lv->($scfg->{vgname}, $scfg->{thinpool}, $cache); } sub activate_volume { my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_; my $vg = $scfg->{vgname}; + my $lv = $snapname ? "snap_${volname}_$snapname" : $volname; - # only snapshot volumes needs activation - if ($snapname) { - my $snapvol = "snap_${volname}_$snapname"; - my $cmd = ['/sbin/lvchange', '-ay', '-K', "$vg/$snapvol"]; - run_command($cmd, errmsg => "activate_volume '$vg/$snapvol' error"); - } elsif ($volname =~ /^base-/) { - my $cmd = ['/sbin/lvchange', '-ay', '-K', "$vg/$volname"]; - run_command($cmd, errmsg => "activate_volume '$vg/$volname' error"); - } else { - # other volumes are active by default - } + $activate_lv->($vg, $lv, $cache); } sub deactivate_volume { my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_; + return if !$snapname && $volname !~ /^base-/; # other volumes are kept active + my $vg = $scfg->{vgname}; + my $lv = $snapname ? "snap_${volname}_$snapname" : $volname; - # we only deactivate snapshot volumes - if ($snapname) { - my $snapvol = "snap_${volname}_$snapname"; - my $cmd = ['/sbin/lvchange', '-an', "$vg/$snapvol"]; - run_command($cmd, errmsg => "deactivate_volume '$vg/$snapvol' error"); - } elsif ($volname =~ /^base-/) { - my $cmd = ['/sbin/lvchange', '-an', "$vg/$volname"]; - run_command($cmd, errmsg => "deactivate_volume '$vg/$volname' error"); - } else { - # other volumes are kept active - } + run_command(['lvchange', '-an', "$vg/$lv"], errmsg => "deactivate_volume '$vg/$lv' error"); + + $cache->{lvs}->{$vg}->{$lv}->{lv_state} = '-' # update cache + if $cache->{lvs} && $cache->{lvs}->{$vg} && $cache->{lvs}->{$vg}->{$lv}; + + return; } sub clone_image { -- 2.30.2