mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Address review comments
This commit is contained in:
parent
5fcb82dde9
commit
f385dfcb3b
@ -216,6 +216,7 @@ func (m *localVolumeMounter) SetUpAt(dir string, fsGroup *types.UnixGroupID) err
|
||||
glog.V(4).Infof("attempting to mount %s", dir)
|
||||
err = m.mounter.Mount(m.globalPath, dir, "", options)
|
||||
if err != nil {
|
||||
glog.Errorf("Mount of volume %s failed: %v", dir, err)
|
||||
notMnt, mntErr := m.mounter.IsLikelyNotMountPoint(dir)
|
||||
if mntErr != nil {
|
||||
glog.Errorf("IsLikelyNotMountPoint check failed: %v", mntErr)
|
||||
@ -226,7 +227,7 @@ func (m *localVolumeMounter) SetUpAt(dir string, fsGroup *types.UnixGroupID) err
|
||||
glog.Errorf("Failed to unmount: %v", mntErr)
|
||||
return err
|
||||
}
|
||||
notMnt, mntErr := m.mounter.IsLikelyNotMountPoint(dir)
|
||||
notMnt, mntErr = m.mounter.IsLikelyNotMountPoint(dir)
|
||||
if mntErr != nil {
|
||||
glog.Errorf("IsLikelyNotMountPoint check failed: %v", mntErr)
|
||||
return err
|
||||
@ -238,7 +239,6 @@ func (m *localVolumeMounter) SetUpAt(dir string, fsGroup *types.UnixGroupID) err
|
||||
}
|
||||
}
|
||||
os.Remove(dir)
|
||||
glog.Errorf("Mount of volume %s failed: %v", dir, err)
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -76,7 +76,7 @@ type VolumeTestConfig struct {
|
||||
ServerImage string
|
||||
// Ports to export from the server pod. TCP only.
|
||||
ServerPorts []int
|
||||
// Commands to run in the comtainer image.
|
||||
// Commands to run in the container image.
|
||||
ServerCmds []string
|
||||
// Arguments to pass to the container image.
|
||||
ServerArgs []string
|
||||
|
@ -165,8 +165,8 @@ func cleanupLocalVolume(config *localTestConfig, volume *localTestVolume) {
|
||||
}
|
||||
|
||||
By("Removing the test directory")
|
||||
writeCmd := fmt.Sprintf("rm -r %s", volume.containerDir)
|
||||
runLocalUtil(config, volume.node.Name, writeCmd)
|
||||
removeCmd := fmt.Sprintf("rm -r %s", volume.containerDir)
|
||||
runLocalUtil(config, volume.node.Name, removeCmd)
|
||||
}
|
||||
|
||||
func runLocalUtil(config *localTestConfig, nodeName, cmd string) {
|
||||
|
Loading…
Reference in New Issue
Block a user