github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76540 from ialidzhikov/glusterfs-uneffectual-assignment 

Remove ineffectual assignment
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-18 17:17:55 -07:00 committed by GitHub
parent b13b2bb178 98c976ae4f
commit fc545587e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/volume/glusterfs/glusterfs.go
View File

@ -328,7 +328,6 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
if b.readOnly { if b.readOnly {
options = append(options, "ro") options = append(options, "ro")
} }
// Check for log-file,log-level options existence in user supplied mount options, if provided, use those. // Check for log-file,log-level options existence in user supplied mount options, if provided, use those.
@ -348,7 +347,6 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
// If logfile has not been provided, create driver specific log file. // If logfile has not been provided, create driver specific log file.
if !hasLogFile { if !hasLogFile {
log = ""
p := path.Join(b.glusterfs.plugin.host.GetPluginDir(glusterfsPluginName), b.glusterfs.volName) p := path.Join(b.glusterfs.plugin.host.GetPluginDir(glusterfsPluginName), b.glusterfs.volName)
if err := os.MkdirAll(p, 0750); err != nil { if err := os.MkdirAll(p, 0750); err != nil {
return fmt.Errorf("failed to create directory %v: %v", p, err) return fmt.Errorf("failed to create directory %v: %v", p, err)
@ -361,7 +359,6 @@ func (b *glusterfsMounter) setUpAtInternal(dir string) error {
// Use derived log file in gluster fuse mount // Use derived log file in gluster fuse mount
options = append(options, "log-file="+log) options = append(options, "log-file="+log)
} }
if !hasLogLevel { if !hasLogLevel {