feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

osd: fix osd resources per device class

Browse Source 
GetOSDResources method was populating
wrong device class to get the osd
resources
This fix will fix the deviceClass label
for the GetOSDResources function

Signed-off-by: parth-gr <partharora1010@gmail.com>
(cherry picked from commit 50d6d6ab5f)
This commit is contained in:
parth-gr authored and Mergify committed 2024-12-05 23:21:32 +00:00
1 parent a2a92b7c4d
commit 67b2cee921
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/operator/ceph/cluster/osd/key_rotation.go
+1 -1
View File
@@ -265,7 +265,7 @@ func (c *Cluster) reconcileKeyRotationCronJob() error {
return errors.Errorf("pvc name label %q for osd %q is empty",
OSDOverPVCLabelKey, osdDep.Name)
}
osdProps, err := c.getOSDPropsForPVC(pvcName, osd.DeviceClass)
osdProps, err := c.getOSDPropsForPVC(pvcName)
if err != nil {
return errors.Wrapf(err, "failed to generate config for osd %q", osdDep.Name)
}
pkg/operator/ceph/cluster/osd/osd.go
+3 -3
View File
@@ -408,7 +408,7 @@ func deploymentOnNode(c *Cluster, osd *OSDInfo, nodeName string, config *provisi
func deploymentOnPVC(c *Cluster, osd *OSDInfo, pvcName string, config *provisionConfig) (*appsv1.Deployment, error) {
osdLongName := fmt.Sprintf("OSD %d on PVC %q", osd.ID, pvcName)
osdProps, err := c.getOSDPropsForPVC(pvcName, osd.DeviceClass)
osdProps, err := c.getOSDPropsForPVC(pvcName)
if err != nil {
return nil, errors.Wrapf(err, "failed to generate config for %s", osdLongName)
}
@@ -468,7 +468,7 @@ func (c *Cluster) getOSDPropsForNode(nodeName, deviceClass string) (osdPropertie
return osdProps, nil
}
func (c *Cluster) getOSDPropsForPVC(pvcName, osdDeviceClass string) (osdProperties, error) {
func (c *Cluster) getOSDPropsForPVC(pvcName string) (osdProperties, error) {
for _, deviceSet := range c.deviceSets {
// The data PVC template is required.
dataSource, dataOK := deviceSet.PVCSources[bluestorePVCData]
@@ -491,7 +491,7 @@ func (c *Cluster) getOSDPropsForPVC(pvcName, osdDeviceClass string) (osdProperti
}
if deviceSet.Resources.Limits == nil && deviceSet.Resources.Requests == nil {
deviceSet.Resources = cephv1.GetOSDResources(c.spec.Resources, osdDeviceClass)
deviceSet.Resources = cephv1.GetOSDResources(c.spec.Resources, deviceSet.CrushDeviceClass)
}
osdProps := osdProperties{