mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
Use more meaningful and consistent variable names in glusterfs plugin.
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
parent
46fe7f062b
commit
8cb70cd0e6
@ -81,7 +81,6 @@ const (
|
|||||||
absoluteGidMin = 2000
|
absoluteGidMin = 2000
|
||||||
absoluteGidMax = math.MaxInt32
|
absoluteGidMax = math.MaxInt32
|
||||||
linuxGlusterMountBinary = "mount.glusterfs"
|
linuxGlusterMountBinary = "mount.glusterfs"
|
||||||
autoUnmountBinaryVer = "3.11"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func (plugin *glusterfsPlugin) Init(host volume.VolumeHost) error {
|
func (plugin *glusterfsPlugin) Init(host volume.VolumeHost) error {
|
||||||
@ -138,12 +137,12 @@ func (plugin *glusterfsPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, _ volu
|
|||||||
source, _ := plugin.getGlusterVolumeSource(spec)
|
source, _ := plugin.getGlusterVolumeSource(spec)
|
||||||
epName := source.EndpointsName
|
epName := source.EndpointsName
|
||||||
// PVC/POD is in same ns.
|
// PVC/POD is in same ns.
|
||||||
ns := pod.Namespace
|
podNs := pod.Namespace
|
||||||
kubeClient := plugin.host.GetKubeClient()
|
kubeClient := plugin.host.GetKubeClient()
|
||||||
if kubeClient == nil {
|
if kubeClient == nil {
|
||||||
return nil, fmt.Errorf("glusterfs: failed to get kube client to initialize mounter")
|
return nil, fmt.Errorf("glusterfs: failed to get kube client to initialize mounter")
|
||||||
}
|
}
|
||||||
ep, err := kubeClient.Core().Endpoints(ns).Get(epName, metav1.GetOptions{})
|
ep, err := kubeClient.Core().Endpoints(podNs).Get(epName, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Errorf("glusterfs: failed to get endpoints %s[%v]", epName, err)
|
glog.Errorf("glusterfs: failed to get endpoints %s[%v]", epName, err)
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -354,8 +353,8 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
autoerrs := b.mounter.Mount(ip+":"+b.path, dir, "glusterfs", autoMountOptions)
|
autoErr := b.mounter.Mount(ip+":"+b.path, dir, "glusterfs", autoMountOptions)
|
||||||
if autoerrs == nil {
|
if autoErr == nil {
|
||||||
glog.Infof("glusterfs: successfully mounted %s", dir)
|
glog.Infof("glusterfs: successfully mounted %s", dir)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -365,10 +364,10 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
|
|||||||
// Failed mount scenario.
|
// Failed mount scenario.
|
||||||
// Since glusterfs does not return error text
|
// Since glusterfs does not return error text
|
||||||
// it all goes in a log file, we will read the log file
|
// it all goes in a log file, we will read the log file
|
||||||
logerror := readGlusterLog(log, b.pod.Name)
|
logErr := readGlusterLog(log, b.pod.Name)
|
||||||
if logerror != nil {
|
if logErr != nil {
|
||||||
// return fmt.Errorf("glusterfs: mount failed: %v", logerror)
|
// return fmt.Errorf("glusterfs: mount failed: %v", logErr)
|
||||||
return fmt.Errorf("glusterfs: mount failed: %v the following error information was pulled from the glusterfs log to help diagnose this issue: %v", errs, logerror)
|
return fmt.Errorf("glusterfs: mount failed: %v the following error information was pulled from the glusterfs log to help diagnose this issue: %v", errs, logErr)
|
||||||
}
|
}
|
||||||
return fmt.Errorf("glusterfs: mount failed: %v", errs)
|
return fmt.Errorf("glusterfs: mount failed: %v", errs)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user