Merge pull request #15247 from rook/mergify/bp/release-1.16/pr-15242

osd: use bluestore if store type is empty (backport #15242)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2025-01-16 14:00:42 -07:00
commit bb2efcc5f6
1 file changed
+3 -2
+3 -2
View File
@@ -105,14 +105,15 @@ func (m *migrationConfig) migrateForEncryption(c *Cluster, osdDeployments *appsv
// migrateForOSDStore gets all the OSDs that require migration due to change in the cephCluster OSD storeType setting
func (m *migrationConfig) migrateForOSDStore(c *Cluster, osdDeployments *appsv1.DeploymentList) error {
desiredOSDStore := c.spec.Storage.GetOSDStore()
for i := range osdDeployments.Items {
if osdStore, ok := osdDeployments.Items[i].Labels[osdStore]; ok {
if osdStore != string(c.spec.Storage.Store.Type) {
if osdStore != desiredOSDStore {
osdInfo, err := c.getOSDInfo(&osdDeployments.Items[i])
if err != nil {
return errors.Wrapf(err, "failed to details about the OSD %q", osdDeployments.Items[i].Name)
}
logger.Infof("migration is required for OSD.%d to update storeType from %q to %q", osdInfo.ID, osdStore, c.spec.Storage.Store.Type)
logger.Infof("migration is required for OSD.%d to update storeType from %q to %q", osdInfo.ID, osdStore, desiredOSDStore)
if _, exists := m.osds[osdInfo.ID]; !exists {
m.osds[osdInfo.ID] = &osdInfo
}