Merge pull request #14709 from travisn/crush-neg-num

pool: Allow negative step num in crush rule
This commit is contained in:
Travis Nielsen authored and GitHub committed 2024-09-10 07:57:30 -06:00
commit 2d12ce5f8e
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -75,7 +75,7 @@ type ruleSpec struct {
type stepSpec struct {
Operation string `json:"op"`
Number uint `json:"num"`
Number int `json:"num"`
Item int `json:"item"`
ItemName string `json:"item_name"`
Type string `json:"type"`
+1 -1
View File
@@ -150,7 +150,7 @@ func buildTwoStepCrushSteps(pool cephv1.PoolSpec) []stepSpec {
// Step three
stepTakeSubFailureDomain := &stepSpec{
Operation: "chooseleaf_firstn",
Number: pool.Replicated.ReplicasPerFailureDomain,
Number: int(pool.Replicated.ReplicasPerFailureDomain),
Type: pool.Replicated.SubFailureDomain,
}
steps = append(steps, *stepTakeSubFailureDomain)
+1 -1
View File
@@ -56,7 +56,7 @@ func TestBuildCrushSteps(t *testing.T) {
assert.Equal(t, 4, len(steps))
assert.Equal(t, cephv1.DefaultCRUSHRoot, steps[0].ItemName)
assert.Equal(t, "datacenter", steps[1].Type)
assert.Equal(t, uint(2), steps[2].Number)
assert.Equal(t, 2, steps[2].Number)
}
func TestCompileCRUSHMap(t *testing.T) {