mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-20 05:10:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading data from configmaps.

Browse Source
This commit is contained in:
Dylan Redding 2019-04-24 17:55:32 -05:00 committed by mergify[bot]
parent de94cb62a9
commit b488a5ae85
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gopkg.lock generated
View File

@ -528,6 +528,7 @@
"k8s.io/apimachinery/pkg/api/errors", "k8s.io/apimachinery/pkg/api/errors",
"k8s.io/apimachinery/pkg/apis/meta/v1", "k8s.io/apimachinery/pkg/apis/meta/v1",
"k8s.io/apimachinery/pkg/util/sets", "k8s.io/apimachinery/pkg/util/sets",
"k8s.io/apimachinery/pkg/util/validation",
"k8s.io/apimachinery/pkg/util/wait", "k8s.io/apimachinery/pkg/util/wait",
"k8s.io/client-go/kubernetes", "k8s.io/client-go/kubernetes",
"k8s.io/client-go/rest", "k8s.io/client-go/rest",

12
pkg/rbd/controllerserver.go
View File

@ -50,8 +50,8 @@ type ControllerServer struct {
} }
var ( var (
rbdVolumes = map[string]*rbdVolume{} rbdVolumes = map[string]rbdVolume{}
rbdSnapshots = map[string]*rbdSnapshot{} rbdSnapshots = map[string]rbdSnapshot{}
) )
// LoadExDataFromMetadataStore loads the rbd volume and snapshot // LoadExDataFromMetadataStore loads the rbd volume and snapshot
@ -60,14 +60,14 @@ func (cs *ControllerServer) LoadExDataFromMetadataStore() error {
vol := &rbdVolume{} vol := &rbdVolume{}
// nolint // nolint
cs.MetadataStore.ForAll("csi-rbd-vol-", vol, func(identifier string) error { cs.MetadataStore.ForAll("csi-rbd-vol-", vol, func(identifier string) error {
rbdVolumes[identifier] = vol rbdVolumes[identifier] = *vol
return nil return nil
}) })
snap := &rbdSnapshot{} snap := &rbdSnapshot{}
// nolint // nolint
cs.MetadataStore.ForAll("csi-rbd-(.*)-snap-", snap, func(identifier string) error { cs.MetadataStore.ForAll("csi-rbd-(.*)-snap-", snap, func(identifier string) error {
rbdSnapshots[identifier] = snap rbdSnapshots[identifier] = *snap
return nil return nil
}) })
@ -194,7 +194,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
// size in bytes) // size in bytes)
rbdVol.VolSize = rbdVol.VolSize * util.MiB rbdVol.VolSize = rbdVol.VolSize * util.MiB
rbdVolumes[rbdVol.VolID] = rbdVol rbdVolumes[rbdVol.VolID] = *rbdVol
if err = storeVolumeMetadata(rbdVol, cs.MetadataStore); err != nil { if err = storeVolumeMetadata(rbdVol, cs.MetadataStore); err != nil {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
@ -444,7 +444,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
rbdSnap.CreatedAt = ptypes.TimestampNow().GetSeconds() rbdSnap.CreatedAt = ptypes.TimestampNow().GetSeconds()
rbdSnapshots[snapshotID] = rbdSnap rbdSnapshots[snapshotID] = *rbdSnap
if err = storeSnapshotMetadata(rbdSnap, cs.MetadataStore); err != nil { if err = storeSnapshotMetadata(rbdSnap, cs.MetadataStore); err != nil {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())

8
pkg/rbd/rbd_util.go
View File

@ -400,7 +400,7 @@ func hasSnapshotFeature(imageFeatures string) bool {
func getRBDVolumeByID(volumeID string) (*rbdVolume, error) { func getRBDVolumeByID(volumeID string) (*rbdVolume, error) {
if rbdVol, ok := rbdVolumes[volumeID]; ok { if rbdVol, ok := rbdVolumes[volumeID]; ok {
return rbdVol, nil return &rbdVol, nil
} }
return nil, fmt.Errorf("volume id %s does not exit in the volumes list", volumeID) return nil, fmt.Errorf("volume id %s does not exit in the volumes list", volumeID)
} }
@ -408,7 +408,7 @@ func getRBDVolumeByID(volumeID string) (*rbdVolume, error) {
func getRBDVolumeByName(volName string) (*rbdVolume, error) { func getRBDVolumeByName(volName string) (*rbdVolume, error) {
for _, rbdVol := range rbdVolumes { for _, rbdVol := range rbdVolumes {
if rbdVol.VolName == volName { if rbdVol.VolName == volName {
return rbdVol, nil return &rbdVol, nil
} }
} }
return nil, fmt.Errorf("volume name %s does not exit in the volumes list", volName) return nil, fmt.Errorf("volume name %s does not exit in the volumes list", volName)
@ -417,7 +417,7 @@ func getRBDVolumeByName(volName string) (*rbdVolume, error) {
func getRBDSnapshotByName(snapName string) (*rbdSnapshot, error) { func getRBDSnapshotByName(snapName string) (*rbdSnapshot, error) {
for _, rbdSnap := range rbdSnapshots { for _, rbdSnap := range rbdSnapshots {
if rbdSnap.SnapName == snapName { if rbdSnap.SnapName == snapName {
return rbdSnap, nil return &rbdSnap, nil
} }
} }
return nil, fmt.Errorf("snapshot name %s does not exit in the snapshots list", snapName) return nil, fmt.Errorf("snapshot name %s does not exit in the snapshots list", snapName)
@ -467,7 +467,7 @@ func protectSnapshot(pOpts *rbdSnapshot, adminID string, credentials map[string]
return nil return nil
} }
func extractStoredVolOpt(r *rbdVolume) map[string]string { func extractStoredVolOpt(r rbdVolume) map[string]string {
volOptions := make(map[string]string) volOptions := make(map[string]string)
volOptions["pool"] = r.Pool volOptions["pool"] = r.Pool