Skip to content

Commit 3fbf68e

Browse files
committed
Add path exist check in getPodVolumePathListFromDisk
Add the path exist check in the function. If the path does not exist, return empty list and nil error.
1 parent 9ce8f10 commit 3fbf68e

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

Diff for: pkg/kubelet/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ go_library(
113113
"//pkg/util/wait:go_default_library",
114114
"//pkg/version:go_default_library",
115115
"//pkg/volume:go_default_library",
116+
"//pkg/volume/util:go_default_library",
116117
"//pkg/volume/util/types:go_default_library",
117118
"//pkg/volume/util/volumehelper:go_default_library",
118119
"//plugin/pkg/scheduler/algorithm/predicates:go_default_library",

Diff for: pkg/kubelet/kubelet_getters.go

+9
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/kubernetes/pkg/types"
3131
"k8s.io/kubernetes/pkg/util"
3232
nodeutil "k8s.io/kubernetes/pkg/util/node"
33+
volumeutil "k8s.io/kubernetes/pkg/volume/util"
3334
)
3435

3536
// getRootDir returns the full path to the directory under which kubelet can
@@ -244,6 +245,14 @@ func (kl *Kubelet) GetExtraSupplementalGroupsForPod(pod *v1.Pod) []int64 {
244245
func (kl *Kubelet) getPodVolumePathListFromDisk(podUID types.UID) ([]string, error) {
245246
volumes := []string{}
246247
podVolDir := kl.getPodVolumesDir(podUID)
248+
249+
if pathExists, pathErr := volumeutil.PathExists(podVolDir); pathErr != nil {
250+
return volumes, fmt.Errorf("Error checking if path %q exists: %v", podVolDir, pathErr)
251+
} else if !pathExists {
252+
glog.Warningf("Warning: path %q does not exist: %q", podVolDir)
253+
return volumes, nil
254+
}
255+
247256
volumePluginDirs, err := ioutil.ReadDir(podVolDir)
248257
if err != nil {
249258
glog.Errorf("Could not read directory %s: %v", podVolDir, err)

0 commit comments

Comments
 (0)