From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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 7F56AC7D9
 for <pve-devel@lists.proxmox.com>; Wed,  4 May 2022 10:15:33 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 7781A99CD
 for <pve-devel@lists.proxmox.com>; Wed,  4 May 2022 10:15:03 +0200 (CEST)
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 0571999C4
 for <pve-devel@lists.proxmox.com>; Wed,  4 May 2022 10:15:03 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D3FCB42AB3
 for <pve-devel@lists.proxmox.com>; Wed,  4 May 2022 10:15:02 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed,  4 May 2022 10:15:02 +0200
Message-Id: <20220504081502.810023-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.120 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
 T_SCC_BODY_TEXT_LINE    -0.01 -
Subject: [pve-devel] [PATCH container] move_volume: call deactivate volume
 for the old volid in any case
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2022 08:15:33 -0000

not only when we want to remove it. Otherwise, if the old volume is
mapped (e.g. ceph krbd), we don't unmap it when we're finished.

We have to save if we deactivated successfully before attempting to
remove it. If it was not removed (either because we could not
deactivate, or the remove failed), we add it back as unused.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PVE/API2/LXC.pm | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 64724cb..e909cb0 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -2043,13 +2043,23 @@ __PACKAGE__->register_method({
 		    die $err;
 		}
 
+		my $deactivated = 0;
+		eval {
+		    PVE::Storage::deactivate_volumes($storage_cfg, [ $old_volid ]);
+		    $deactivated = 1;
+		};
+		warn $@ if $@;
+
 		if ($param->{delete}) {
-		    eval {
-			PVE::Storage::deactivate_volumes($storage_cfg, [ $old_volid ]);
-			PVE::Storage::vdisk_free($storage_cfg, $old_volid);
-		    };
-		    if (my $err = $@) {
-			warn $err;
+		    my $removed = 0;
+		    if ($deactivated) {
+			eval {
+			    PVE::Storage::vdisk_free($storage_cfg, $old_volid);
+			    $removed = 1;
+			};
+			warn $@ if $@;
+		    }
+		    if (!$removed) {
 			PVE::LXC::Config->lock_config($vmid, sub {
 			    my $conf = PVE::LXC::Config->load_config($vmid);
 			    PVE::LXC::Config->add_unused_volume($conf, $old_volid);
-- 
2.30.2