From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/5] api: ceph: $get_storages check if data-pool too
Date: Thu, 28 Apr 2022 13:58:05 +0200 [thread overview]
Message-ID: <20220428115809.1661165-2-a.lauterer@proxmox.com> (raw)
In-Reply-To: <20220428115809.1661165-1-a.lauterer@proxmox.com>
When removing a pool, we check against any storage that might have that
pool configured.
We need to check if that pool is used as data-pool too.
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
This check should have been added when we added basic support for EC
pools on the storage side [0].
[0] https://git.proxmox.com/?p=pve-storage.git;a=commit;h=ef2afce74aba01f2ab698a5477f5e396fa4d3725
PVE/API2/Ceph/Pools.pm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Ceph/Pools.pm b/PVE/API2/Ceph/Pools.pm
index 002f7893..05855e15 100644
--- a/PVE/API2/Ceph/Pools.pm
+++ b/PVE/API2/Ceph/Pools.pm
@@ -302,8 +302,13 @@ my $get_storages = sub {
my $res = {};
foreach my $storeid (keys %$storages) {
my $curr = $storages->{$storeid};
- $res->{$storeid} = $storages->{$storeid}
- if $curr->{type} eq 'rbd' && $pool eq $curr->{pool};
+ next if $curr->{type} ne 'rbd';
+ if (
+ $pool eq $curr->{pool} ||
+ (defined $curr->{'data-pool'} && $pool eq $curr->{'data-pool'})
+ ) {
+ $res->{$storeid} = $storages->{$storeid};
+ }
}
return $res;
--
2.30.2
next prev parent reply other threads:[~2022-04-28 11:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 11:58 [pve-devel] [PATCH manager 0/5] Ceph add basic erasure code pool mgmt support Aaron Lauterer
2022-04-28 11:58 ` Aaron Lauterer [this message]
2022-04-28 11:58 ` [pve-devel] [PATCH manager 2/5] ceph tools: add erasure code management functions Aaron Lauterer
2022-04-28 14:19 ` Dominik Csapak
2022-04-28 11:58 ` [pve-devel] [PATCH manager 3/5] ceph tools: add function to get pool properties Aaron Lauterer
2022-04-28 14:20 ` Dominik Csapak
2022-04-28 11:58 ` [pve-devel] [PATCH manager 4/5] ceph tools: add destroy crush rule destroy function Aaron Lauterer
2022-04-28 11:58 ` [pve-devel] [PATCH manager 5/5] ceph pools: allow to create erasure code pools Aaron Lauterer
2022-04-28 14:32 ` Dominik Csapak
2022-04-29 7:33 ` Aaron Lauterer
2022-04-29 7:40 ` Thomas Lamprecht
2022-04-29 9:27 ` Aaron Lauterer
2022-04-28 18:31 ` [pve-devel] applied: " Thomas Lamprecht
2022-04-28 18:33 ` [pve-devel] applied: [PATCH manager 0/5] Ceph add basic erasure code pool mgmt support Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220428115809.1661165-2-a.lauterer@proxmox.com \
--to=a.lauterer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox