ceph pools create: remove crush_rule for ec pool data

[pve-manager.git] / PVE / API2 / Ceph / Pools.pm

diff --git a/PVE/API2/Ceph/Pools.pm b/PVE/API2/Ceph/Pools.pm
index 975cc1027b0070db96235588620d45517c98357d..9c3b88844d6caa1e8d3c9c1a8f325ba671f1231b 100644 (file)
--- a/PVE/API2/Ceph/Pools.pm
+++ b/PVE/API2/Ceph/Pools.pm
@@ -66,6 +66,11 @@ __PACKAGE__->register_method ({
                    type => 'integer',
                    title => 'Size',
                },
+               type => {
+                   type => 'string',
+                   title => 'Type',
+                   enum => ['replicated', 'erasure', 'unknown'],
+               },
                min_size => {
                    type => 'integer',
                    title => 'Min Size',
@@ -185,6 +190,17 @@ __PACKAGE__->register_method ({
                $d->{bytes_used} = $s->{bytes_used};
                $d->{percent_used} = $s->{percent_used};
            }
+
+           # Cephs numerical pool types are barely documented. Found the following in the Ceph
+           # codebase: https://github.com/ceph/ceph/blob/ff144995a849407c258bcb763daa3e03cfce5059/src/osd/osd_types.h#L1221-L1233
+           if ($e->{type} == 1) {
+               $d->{type} = 'replicated';
+           } elsif ($e->{type} == 3) {
+               $d->{type} = 'erasure';
+           } else {
+               # we should never get here, but better be safe
+               $d->{type} = 'unknown';
+           }
            push @$data, $d;
        }
 
@@ -387,8 +403,8 @@ __PACKAGE__->register_method ({
                default => "0; for erasure coded pools: 1",
            },
            'erasure-coding' => {
-               description => "Create an erasure coded pool for RBD with an ".
-                               "accompaning replicated pool for metadata storage.",
+               description => "Create an erasure coded pool for RBD with an"
+                   ." accompaning replicated pool for metadata storage.",
                type => 'string',
                format => $ec_format,
                optional => 1,
@@ -458,6 +474,7 @@ __PACKAGE__->register_method ({
                $ec_data_param->{erasure_code_profile} = $ec->{profile};
                delete $ec_data_param->{size};
                delete $ec_data_param->{min_size};
+               delete $ec_data_param->{crush_rule};
 
                # metadata pool should be ok with 32 PGs
                $param->{pg_num} = 32;