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 929318295 for ; Tue, 15 Nov 2022 11:56:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A9C916E6 for ; Tue, 15 Nov 2022 11:56:00 +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 for ; Tue, 15 Nov 2022 11:55:59 +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 C548443DD0 for ; Tue, 15 Nov 2022 11:55:58 +0100 (CET) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Tue, 15 Nov 2022 11:55:26 +0100 Message-Id: <20221115105526.3428334-7-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221115105526.3428334-1-s.hrdlicka@proxmox.com> References: <20221115105526.3428334-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.033 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH V3 pve-manager 6/6] fix #3711: optionally allow CT deletion to complete on disk volume removal errors 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: Tue, 15 Nov 2022 10:56:00 -0000 Add a checkbox to the remove dialog of LXC containers and VMs to force deleting a container/VM if the storage it uses has been removed. Signed-off-by: Stefan Hrdlicka --- www/manager6/lxc/Config.js | 1 + www/manager6/qemu/Config.js | 1 + www/manager6/window/SafeDestroyGuest.js | 34 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 93f385db..a00e1927 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -154,6 +154,7 @@ Ext.define('PVE.lxc.Config', { url: base_url, item: { type: 'CT', id: vmid }, taskName: 'vzdestroy', + showForceRemoveMissingStorage: true, }).show(); }, iconCls: 'fa fa-trash-o', diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index 9fe933df..150835ed 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -129,6 +129,7 @@ Ext.define('PVE.qemu.Config', { url: base_url, item: { type: 'VM', id: vmid }, taskName: 'qmdestroy', + showForceRemoveMissingStorage: true, }).show(); }, iconCls: 'fa fa-trash-o', diff --git a/www/manager6/window/SafeDestroyGuest.js b/www/manager6/window/SafeDestroyGuest.js index 3328293a..6cffa2bb 100644 --- a/www/manager6/window/SafeDestroyGuest.js +++ b/www/manager6/window/SafeDestroyGuest.js @@ -28,8 +28,37 @@ Ext.define('PVE.window.SafeDestroyGuest', { 'data-qtip': gettext('Scan all enabled storages for unreferenced disks and delete them.'), }, }, + { + xtype: 'proxmoxcheckbox', + name: 'forceStorageRemove', + reference: 'forceRemoveMissingStorage', + boxLabel: gettext('Ignore missing/unavailable storage.'), + checked: false, + submitValue: false, + hidden: true, + autoEl: { + tag: 'div', + 'data-qtip': gettext('Force remove container when storage is unavailable. ' + + 'The disk is not cleaned if storage still exists.'), + }, + }, ], + config: { + showForceRemoveMissingStorage: false, + }, + + initComponent: function() { + let me = this; + + me.callParent(); + + if (me.showForceRemoveMissingStorage) { + let frms = me.lookupReference('forceRemoveMissingStorage'); + frms.hidden = !me.showForceRemoveMissingStorage; + } + }, + note: gettext('Referenced disks will always be destroyed.'), getParams: function() { @@ -41,6 +70,11 @@ Ext.define('PVE.window.SafeDestroyGuest', { const destroyUnreferencedCheckbox = me.lookupReference('destroyUnreferencedCheckbox'); me.params["destroy-unreferenced-disks"] = destroyUnreferencedCheckbox.checked ? 1 : 0; + if (me.showForceRemoveMissingStorage) { + const forceRemoveMissingStorage = me.lookupReference('forceRemoveMissingStorage'); + me.params['ignore-storage-errors'] = forceRemoveMissingStorage.checked ? 1 : 0; + } + return me.callParent(); }, }); -- 2.30.2