core: only support isa and jerasure algorithms on ec pools
The `CephBlockPool` CR allowed any algorithm to be specified in
`spec.erasureCoded.algorithm`, but in practice only `isa` or `jerasure`
would work.
Make that restriction explicit by restricting this field to `isa` or
`jerasure` in the CRD.
Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit 0b423a30f9)
This commit is contained in:
Benoît Knecht authored and 
Mergify committed
1 parent
f1c9de5b4c
commit
7b082939b8
4 files changed
+89
-16
No files matched your search
@@ -6678,7 +6678,8 @@ string
|
||||
</td>
|
||||
<td>
|
||||
<em>(Optional)</em>
|
||||
<p>The algorithm for erasure coding</p>
|
||||
<p>The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.</p>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -454,7 +454,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -7551,7 +7556,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -7740,7 +7750,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -11445,7 +11460,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -13046,7 +13066,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -14006,7 +14031,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -14190,7 +14220,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
|
||||
@@ -456,7 +456,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -7546,7 +7551,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -7735,7 +7745,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -11436,7 +11451,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -13037,7 +13057,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -13994,7 +14019,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
@@ -14178,7 +14208,12 @@ spec:
|
||||
description: The erasure code settings
|
||||
properties:
|
||||
algorithm:
|
||||
description: The algorithm for erasure coding
|
||||
description: |-
|
||||
The algorithm for erasure coding.
|
||||
If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
enum:
|
||||
- isa
|
||||
- jerasure
|
||||
type: string
|
||||
codingChunks:
|
||||
description: |-
|
||||
|
||||
@@ -1315,7 +1315,9 @@ type ErasureCodedSpec struct {
|
||||
// +kubebuilder:validation:Minimum=0
|
||||
DataChunks uint `json:"dataChunks"`
|
||||
|
||||
// The algorithm for erasure coding
|
||||
// The algorithm for erasure coding.
|
||||
// If absent, defaults to the plugin specified in osd_pool_default_erasure_code_profile.
|
||||
// +kubebuilder:validation:Enum=isa;jerasure
|
||||
// +optional
|
||||
Algorithm string `json:"algorithm,omitempty"`
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user