mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-22 04:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

code style

Browse Source
This commit is contained in:
王怀宗 2019-04-01 23:02:19 +08:00
parent 6de862d6cb
commit 1f1d5f47c3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cephfs/mountcache.go
View File

@ -143,7 +143,7 @@ func mountOneCacheEntry(ce *controllerCacheEntry, me *volumeMountCacheEntry) err
klog.Errorf("mount-cache: failed to bind-mount volume %s: %s %s %v %v", klog.Errorf("mount-cache: failed to bind-mount volume %s: %s %s %v %v",
volID, me.StagingPath, targetPath, readOnly, err) volID, me.StagingPath, targetPath, readOnly, err)
} else { } else {
klog.Infof("mount-cache: successfully bind-mount volume %s: %s %s %v", klog.Infof("mount-cache: successfully bind-mounted volume %s: %s %s %v",
volID, me.StagingPath, targetPath, readOnly) volID, me.StagingPath, targetPath, readOnly)
} }
} }
@ -277,7 +277,7 @@ func (mc *volumeMountCacheMap) nodeUnPublishVolume(volID string, targetPath stri
func (mc *volumeMountCacheMap) updateNodeCache(volID string) error { func (mc *volumeMountCacheMap) updateNodeCache(volID string) error {
me := volumeMountCache.volumes[volID] me := volumeMountCache.volumes[volID]
if err := volumeMountCache.nodeCacheStore.Delete(genVolumeMountCacheFileName(volID)); err == nil { if err := volumeMountCache.nodeCacheStore.Delete(genVolumeMountCacheFileName(volID)); err == nil {
klog.Infof("mount-cache: metadata notfound, delete mount cache failed for volume %s", volID) klog.Infof("mount-cache: metadata not found, delete mount cache failed for volume %s", volID)
} }
return mc.nodeCacheStore.Create(genVolumeMountCacheFileName(volID), me) return mc.nodeCacheStore.Create(genVolumeMountCacheFileName(volID), me)
} }

2
pkg/cephfs/mountcache_test.go
View File

@ -32,7 +32,7 @@ func TestEncodeDecodeCredentials(t *testing.T) {
deSecrets := decodeCredentials(enSecrets) deSecrets := decodeCredentials(enSecrets)
for key, value := range secrets { for key, value := range secrets {
if deSecrets[key] != value { if deSecrets[key] != value {
t.Errorf("key %s value %s not equal %s after encode decode", key, value, deSecrets[key]) t.Errorf("key %s of credentials's value %s change after decode %s ", key, value, deSecrets[key])
} }
} }
} }

8
pkg/cephfs/nodeserver.go
View File

@ -155,7 +155,7 @@ func (*NodeServer) mount(volOptions *volumeOptions, req *csi.NodeStageVolumeRequ
return status.Error(codes.Internal, err.Error()) return status.Error(codes.Internal, err.Error())
} }
if err := volumeMountCache.nodeStageVolume(req.GetVolumeId(), stagingTargetPath, req.GetSecrets()); err != nil { if err := volumeMountCache.nodeStageVolume(req.GetVolumeId(), stagingTargetPath, req.GetSecrets()); err != nil {
klog.Warningf("mount-cache: failed stage volume %s %s: %v", volID, stagingTargetPath, err) klog.Warningf("mount-cache: failed to stage volume %s %s: %v", volID, stagingTargetPath, err)
} }
return nil return nil
} }
@ -199,7 +199,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
} }
if err := volumeMountCache.nodePublishVolume(volID, targetPath, req.GetReadonly()); err != nil { if err := volumeMountCache.nodePublishVolume(volID, targetPath, req.GetReadonly()); err != nil {
klog.Warningf("mount-cache: failed publish volume %s %s: %v", volID, targetPath, err) klog.Warningf("mount-cache: failed to publish volume %s %s: %v", volID, targetPath, err)
} }
klog.Infof("cephfs: successfully bind-mounted volume %s to %s", volID, targetPath) klog.Infof("cephfs: successfully bind-mounted volume %s to %s", volID, targetPath)
@ -218,7 +218,7 @@ func (ns *NodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
volID := req.GetVolumeId() volID := req.GetVolumeId()
if err = volumeMountCache.nodeUnPublishVolume(volID, targetPath); err != nil { if err = volumeMountCache.nodeUnPublishVolume(volID, targetPath); err != nil {
klog.Warningf("mount-cache: failed unpublish volume %s %s: %v", volID, targetPath, err) klog.Warningf("mount-cache: failed to unpublish volume %s %s: %v", volID, targetPath, err)
} }
// Unmount the bind-mount // Unmount the bind-mount
@ -246,7 +246,7 @@ func (ns *NodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
volID := req.GetVolumeId() volID := req.GetVolumeId()
if err = volumeMountCache.nodeUnStageVolume(volID); err != nil { if err = volumeMountCache.nodeUnStageVolume(volID); err != nil {
klog.Warningf("mount-cache: failed unstage volume %s %s: %v", volID, stagingTargetPath, err) klog.Warningf("mount-cache: failed to unstage volume %s %s: %v", volID, stagingTargetPath, err)
} }
// Unmount the volume // Unmount the volume