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

rbd: use librbd.FeatureSet for features

Browse Source 
go-ceph v0.3 adds constants for ImageFeature values and their names.
Instead of hardcoding "layering" in several places, use the constant
given by librbd.

The rbdVolume.ImageFeatures does not seem to be used anywhere after the
conversion. Stashing the image metadata does include the ImageFeatures
as these are retrieved when getting the image information. It is safe to
drop ImageFeatures altogether and only use the imageFeatureSet instead.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-06-18 14:07:21 +02:00 committed by mergify[bot]
parent decfc1ae2c
commit da40d8e05e
2 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
internal/rbd/rbd_util.go
View File

@ -89,7 +89,7 @@ type rbdVolume struct {
JournalPool string JournalPool string
Pool string `json:"pool"` Pool string `json:"pool"`
DataPool string DataPool string
ImageFeatures string `json:"imageFeatures"` imageFeatureSet librbd.FeatureSet
AdminID string `json:"adminId"` AdminID string `json:"adminId"`
UserID string `json:"userId"` UserID string `json:"userId"`
Mounter string `json:"mounter"` Mounter string `json:"mounter"`
@ -132,7 +132,7 @@ type rbdSnapshot struct {
} }
var ( var (
supportedFeatures = sets.NewString("layering") supportedFeatures = sets.NewString(librbd.FeatureNameLayering)
) )
// Connect an rbdVolume to the Ceph cluster // Connect an rbdVolume to the Ceph cluster
@ -190,11 +190,10 @@ func createImage(ctx context.Context, pOpts *rbdVolume, cr *util.Credentials) er
} }
} }
klog.V(4).Infof(util.Log(ctx, logMsg), klog.V(4).Infof(util.Log(ctx, logMsg),
pOpts, volSzMiB, pOpts.ImageFeatures, pOpts.Monitors) pOpts, volSzMiB, pOpts.imageFeatureSet.Names(), pOpts.Monitors)
if pOpts.ImageFeatures != "" { if pOpts.imageFeatureSet != 0 {
features := imageFeaturesToUint64(ctx, pOpts.ImageFeatures) err := options.SetUint64(librbd.RbdImageOptionFeatures, uint64(pOpts.imageFeatureSet))
err := options.SetUint64(librbd.RbdImageOptionFeatures, features)
if err != nil { if err != nil {
return errors.Wrapf(err, "failed to set image features") return errors.Wrapf(err, "failed to set image features")
} }
@ -637,7 +636,7 @@ func genVolFromVolumeOptions(ctx context.Context, volOptions, credentials map[st
" features are: %v", f, supportedFeatures) " features are: %v", f, supportedFeatures)
} }
} }
rbdVol.ImageFeatures = imageFeatures rbdVol.imageFeatureSet = librbd.FeatureSetFromNames(arr)
} }
klog.V(3).Infof(util.Log(ctx, "setting disableInUseChecks on rbd volume to: %v"), disableInUseChecks) klog.V(3).Infof(util.Log(ctx, "setting disableInUseChecks on rbd volume to: %v"), disableInUseChecks)
@ -691,29 +690,9 @@ func genSnapFromOptions(ctx context.Context, rbdVol *rbdVolume, snapOptions map[
return rbdSnap return rbdSnap
} }
// hasSnapshotFeature checks if Layering is enabled for this image
func (rv *rbdVolume) hasSnapshotFeature() bool { func (rv *rbdVolume) hasSnapshotFeature() bool {
arr := strings.Split(rv.ImageFeatures, ",") return (uint64(rv.imageFeatureSet) & librbd.FeatureLayering) == librbd.FeatureLayering
for _, f := range arr {
if f == "layering" {
return true
}
}
return false
}
// imageFeaturesToUint64 takes the comma separated image features and converts
// them to a RbdImageOptionFeatures value.
func imageFeaturesToUint64(ctx context.Context, imageFeatures string) uint64 {
features := uint64(0)
for _, f := range strings.Split(imageFeatures, ",") {
if f == "layering" {
features |= librbd.RbdFeatureLayering
} else {
klog.Warningf(util.Log(ctx, "rbd: image feature %s not recognized, skipping"), f)
}
}
return features
} }
func protectSnapshot(ctx context.Context, pOpts *rbdSnapshot, cr *util.Credentials) error { func protectSnapshot(ctx context.Context, pOpts *rbdSnapshot, cr *util.Credentials) error {
@ -841,8 +820,7 @@ func (rv *rbdVolume) getImageInfo() error {
if err != nil { if err != nil {
return err return err
} }
fs := librbd.FeatureSet(features) rv.imageFeatureSet = librbd.FeatureSet(features)
rv.ImageFeatures = strings.Join(fs.Names(), ",")
return nil return nil
} }

8
internal/rbd/rbd_util_test.go
View File

@ -17,7 +17,10 @@ limitations under the License.
package rbd package rbd
import ( import (
"strings"
"testing" "testing"
librbd "github.com/ceph/go-ceph/rbd"
) )
func TestIsLegacyVolumeID(t *testing.T) { func TestIsLegacyVolumeID(t *testing.T) {
@ -48,8 +51,11 @@ func TestHasSnapshotFeature(t *testing.T) {
{"foo,layering,bar", true}, {"foo,layering,bar", true},
} }
rv := rbdVolume{}
for _, test := range tests { for _, test := range tests {
if got := hasSnapshotFeature(test.features); got != test.hasFeature { rv.imageFeatureSet = librbd.FeatureSetFromNames(strings.Split(test.features, ","))
if got := rv.hasSnapshotFeature(); got != test.hasFeature {
t.Errorf("hasSnapshotFeature(%s) = %t, want %t", test.features, got, test.hasFeature) t.Errorf("hasSnapshotFeature(%s) = %t, want %t", test.features, got, test.hasFeature)
} }
} }