mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-02 19:20:23 +00:00
6753bbfba3
This commit resolves a bug where node labels with empty values
are processed for the crush_location mount option,
leading to invalid mount options and subsequent mount failures.
Signed-off-by: Praveen M <m.praveen@ibm.com>
(cherry picked from commit f11fa815c8)
77 lines
2.5 KiB
Go
77 lines
2.5 KiB
Go
/*
|
|
Copyright 2023 The Ceph-CSI Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package util
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/ceph/ceph-csi/internal/util/log"
|
|
)
|
|
|
|
// GetCrushLocationMap returns the crush location map, determined from
|
|
// the crush location labels and their values from the node labels passed in arg.
|
|
// Expects crushLocationLabels in arg to be in the format "[prefix/]<name>,[prefix/]<name>,...",.
|
|
// Returns map of crush location types with its array of associated values.
|
|
func GetCrushLocationMap(crushLocationLabels string, nodeLabels map[string]string) map[string]string {
|
|
if crushLocationLabels == "" {
|
|
return nil
|
|
}
|
|
|
|
return getCrushLocationMap(crushLocationLabels, nodeLabels)
|
|
}
|
|
|
|
// getCrushLocationMap returns the crush location map, determined from
|
|
// the crush location labels and node labels.
|
|
func getCrushLocationMap(crushLocationLabels string, nodeLabels map[string]string) map[string]string {
|
|
labelsToRead := strings.Split(crushLocationLabels, labelSeparator)
|
|
log.DefaultLog("CRUSH location labels passed for processing: %+v", labelsToRead)
|
|
|
|
labelsIn := make(map[string]bool, len(labelsToRead))
|
|
for _, label := range labelsToRead {
|
|
labelsIn[label] = true
|
|
}
|
|
|
|
// Determine values for requested labels from node labels
|
|
crushLocationMap := make(map[string]string, len(labelsIn))
|
|
for key, value := range nodeLabels {
|
|
// label with empty value is not considered.
|
|
if value == "" {
|
|
continue
|
|
}
|
|
if _, ok := labelsIn[key]; !ok {
|
|
continue
|
|
}
|
|
// label found split name component and store value
|
|
nameIdx := strings.IndexRune(key, keySeparator)
|
|
crushLocationType := strings.TrimSpace(key[nameIdx+1:])
|
|
if crushLocationType == "hostname" {
|
|
// ceph defaults to "host" while Kubernetes uses "hostname" as key.
|
|
crushLocationType = "host"
|
|
}
|
|
// replace "." with "-" to satisfy ceph crush map.
|
|
value = strings.ReplaceAll(strings.TrimSpace(value), ".", "-")
|
|
crushLocationMap[crushLocationType] = value
|
|
}
|
|
|
|
if len(crushLocationMap) == 0 {
|
|
return nil
|
|
}
|
|
log.DefaultLog("list of CRUSH location processed: %+v", crushLocationMap)
|
|
|
|
return crushLocationMap
|
|
}
|