refactor getOsdCount() to make it reusable

Signed-off-by: Umanga Chapagain <[email protected]>
red-hat-storage · Dec 12, 2023 · 2e5b088 · 2e5b088
1 parent 2b565e4
commit 2e5b088
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/storagecluster/cephcluster.go b/controllers/storagecluster/cephcluster.go
@@ -1308,8 +1308,8 @@ func isBluestore(store rookCephv1.OSDStore) bool {
 	return false
 }
 
-func (r *StorageClusterReconciler) getOsdCount(sc *ocsv1.StorageCluster) int {
-	storageClassDeviceSets := newStorageClassDeviceSets(sc, r.serverVersion)
+func getOsdCount(sc *ocsv1.StorageCluster, serverVersion *version.Info) int {
+	storageClassDeviceSets := newStorageClassDeviceSets(sc, serverVersion)
 	osdCount := 0
 	for _, ds := range storageClassDeviceSets {
 		osdCount += ds.Count

diff --git a/controllers/storagecluster/resourceprofile.go b/controllers/storagecluster/resourceprofile.go
@@ -51,7 +51,7 @@ func (r *StorageClusterReconciler) ensureResourceProfileChangeApplied(sc *ocsv1.
 	}
 
 	// Verify if expected number of osd pods with the current resource profile label are running
-	if err := r.verifyDaemonWithResourceProfile(sc.Namespace, map[string]string{"app": "rook-ceph-osd", defaults.ODFResourceProfileKey: currentResourceProfile}, r.getOsdCount(sc)); err != nil {
+	if err := r.verifyDaemonWithResourceProfile(sc.Namespace, map[string]string{"app": "rook-ceph-osd", defaults.ODFResourceProfileKey: currentResourceProfile}, getOsdCount(sc, r.serverVersion)); err != nil {
 		return err
 	}