Merge pull request #2708 from sp98/change-balancer-mode

use "upmap-read" as default balancer mode
red-hat-storage · Jul 22, 2024 · 92a5407 · 92a5407
2 parents 27b0ae9 + c0ff078
commit 92a5407
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/controllers/storagecluster/cephcluster.go b/controllers/storagecluster/cephcluster.go
@@ -73,6 +73,7 @@ const (
 	clusterNetworkSelectorKey = "cluster"
 	// DisasterRecoveryTargetAnnotation signifies that the cluster is intended to be used for Disaster Recovery
 	DisasterRecoveryTargetAnnotation = "ocs.openshift.io/clusterIsDisasterRecoveryTarget"
+	upmapReadBalancerMode            = "upmap-read"
 )
 
 const (
@@ -1101,7 +1102,7 @@ func generateMgrSpec(sc *ocsv1.StorageCluster) rookCephv1.MgrSpec {
 		AllowMultiplePerNode: statusutil.IsSingleNodeDeployment(),
 		Modules: []rookCephv1.Module{
 			{Name: "pg_autoscaler", Enabled: true},
-			{Name: "balancer", Enabled: true},
+			{Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
 		},
 	}
 

diff --git a/controllers/storagecluster/cephcluster_test.go b/controllers/storagecluster/cephcluster_test.go
@@ -305,7 +305,7 @@ func TestGenerateMgrSpec(t *testing.T) {
 				AllowMultiplePerNode: false,
 				Modules: []rookCephv1.Module{
 					{Name: "pg_autoscaler", Enabled: true},
-					{Name: "balancer", Enabled: true},
+					{Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
 				},
 			},
 		},
@@ -325,7 +325,7 @@ func TestGenerateMgrSpec(t *testing.T) {
 				AllowMultiplePerNode: false,
 				Modules: []rookCephv1.Module{
 					{Name: "pg_autoscaler", Enabled: true},
-					{Name: "balancer", Enabled: true},
+					{Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
 				},
 			},
 		},
@@ -348,7 +348,7 @@ func TestGenerateMgrSpec(t *testing.T) {
 				AllowMultiplePerNode: false,
 				Modules: []rookCephv1.Module{
 					{Name: "pg_autoscaler", Enabled: true},
-					{Name: "balancer", Enabled: true},
+					{Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
 				},
 			},
 		},
@@ -361,7 +361,7 @@ func TestGenerateMgrSpec(t *testing.T) {
 				AllowMultiplePerNode: true,
 				Modules: []rookCephv1.Module{
 					{Name: "pg_autoscaler", Enabled: true},
-					{Name: "balancer", Enabled: true},
+					{Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
 				},
 			},
 		},