From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.hrdlicka@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 2FB2E7D40A
for <pve-devel@lists.proxmox.com>; Wed, 20 Jul 2022 16:50:26 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2D9CC35D10
for <pve-devel@lists.proxmox.com>; Wed, 20 Jul 2022 16:50:26 +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
for <pve-devel@lists.proxmox.com>; Wed, 20 Jul 2022 16:50:24 +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 8915242730
for <pve-devel@lists.proxmox.com>; Wed, 20 Jul 2022 16:50:24 +0200 (CEST)
From: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 20 Jul 2022 16:49:49 +0200
Message-Id: <20220720144949.1568323-4-s.hrdlicka@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220720144949.1568323-1-s.hrdlicka@proxmox.com>
References: <20220720144949.1568323-1-s.hrdlicka@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.078 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 pve-manager 3/3] fix #3711: enable removing
container with non existent storage
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, 20 Jul 2022 14:50:26 -0000
Add a checkbox to the remove dialog of LXC containers to force
deleting a container if the storage it uses has been removed.
Signed-off-by: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
---
www/manager6/lxc/Config.js | 1 +
www/manager6/window/SafeDestroyGuest.js | 34 +++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js
index 89b59c9b..3a0acc0a 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/window/SafeDestroyGuest.js b/www/manager6/window/SafeDestroyGuest.js
index 3328293a..2fc4ff26 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['force-remove-storage'] = forceRemoveMissingStorage.checked ? 1 : 0;
+ }
+
return me.callParent();
},
});
--
2.30.2