Commit 90cb1c16 authored by zhangxiaoyu-zidif's avatar zhangxiaoyu-zidif

Fix local storage code to follow go style

parent e794dce4
...@@ -18,9 +18,10 @@ package local ...@@ -18,9 +18,10 @@ package local
import ( import (
"fmt" "fmt"
"github.com/golang/glog"
"os" "os"
"github.com/golang/glog"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
...@@ -204,8 +205,7 @@ func (m *localVolumeMounter) SetUpAt(dir string, fsGroup *int64) error { ...@@ -204,8 +205,7 @@ func (m *localVolumeMounter) SetUpAt(dir string, fsGroup *int64) error {
defer m.plugin.volumeLocks.UnlockKey(m.globalPath) defer m.plugin.volumeLocks.UnlockKey(m.globalPath)
if m.globalPath == "" { if m.globalPath == "" {
err := fmt.Errorf("LocalVolume volume %q path is empty", m.volName) return fmt.Errorf("LocalVolume volume %q path is empty", m.volName)
return err
} }
err := validation.ValidatePathNoBacksteps(m.globalPath) err := validation.ValidatePathNoBacksteps(m.globalPath)
...@@ -234,8 +234,7 @@ func (m *localVolumeMounter) SetUpAt(dir string, fsGroup *int64) error { ...@@ -234,8 +234,7 @@ func (m *localVolumeMounter) SetUpAt(dir string, fsGroup *int64) error {
fsGroupNew := int64(*fsGroup) fsGroupNew := int64(*fsGroup)
fsGroupSame, fsGroupOld, err := volume.IsSameFSGroup(m.globalPath, fsGroupNew) fsGroupSame, fsGroupOld, err := volume.IsSameFSGroup(m.globalPath, fsGroupNew)
if err != nil { if err != nil {
err = fmt.Errorf("failed to check fsGroup for %s (%v)", m.globalPath, err) return fmt.Errorf("failed to check fsGroup for %s (%v)", m.globalPath, err)
return err
} }
if !fsGroupSame { if !fsGroupSame {
m.plugin.recorder.Eventf(m.pod, v1.EventTypeWarning, events.WarnAlreadyMountedVolume, "The requested fsGroup is %d, but the volume %s has GID %d. The volume may not be shareable.", fsGroupNew, m.volName, fsGroupOld) m.plugin.recorder.Eventf(m.pod, v1.EventTypeWarning, events.WarnAlreadyMountedVolume, "The requested fsGroup is %d, but the volume %s has GID %d. The volume may not be shareable.", fsGroupNew, m.volName, fsGroupOld)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment