Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3fbf68ef
Commit
3fbf68ef
authored
Dec 16, 2016
by
Jing Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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.
parent
9ce8f10a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
BUILD
pkg/kubelet/BUILD
+1
-0
kubelet_getters.go
pkg/kubelet/kubelet_getters.go
+9
-0
No files found.
pkg/kubelet/BUILD
View file @
3fbf68ef
...
@@ -113,6 +113,7 @@ go_library(
...
@@ -113,6 +113,7 @@ go_library(
"//pkg/util/wait:go_default_library",
"//pkg/util/wait:go_default_library",
"//pkg/version:go_default_library",
"//pkg/version:go_default_library",
"//pkg/volume:go_default_library",
"//pkg/volume:go_default_library",
"//pkg/volume/util:go_default_library",
"//pkg/volume/util/types:go_default_library",
"//pkg/volume/util/types:go_default_library",
"//pkg/volume/util/volumehelper:go_default_library",
"//pkg/volume/util/volumehelper:go_default_library",
"//plugin/pkg/scheduler/algorithm/predicates:go_default_library",
"//plugin/pkg/scheduler/algorithm/predicates:go_default_library",
...
...
pkg/kubelet/kubelet_getters.go
View file @
3fbf68ef
...
@@ -30,6 +30,7 @@ import (
...
@@ -30,6 +30,7 @@ import (
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util"
nodeutil
"k8s.io/kubernetes/pkg/util/node"
nodeutil
"k8s.io/kubernetes/pkg/util/node"
volumeutil
"k8s.io/kubernetes/pkg/volume/util"
)
)
// getRootDir returns the full path to the directory under which kubelet can
// getRootDir returns the full path to the directory under which kubelet can
...
@@ -244,6 +245,14 @@ func (kl *Kubelet) GetExtraSupplementalGroupsForPod(pod *v1.Pod) []int64 {
...
@@ -244,6 +245,14 @@ func (kl *Kubelet) GetExtraSupplementalGroupsForPod(pod *v1.Pod) []int64 {
func
(
kl
*
Kubelet
)
getPodVolumePathListFromDisk
(
podUID
types
.
UID
)
([]
string
,
error
)
{
func
(
kl
*
Kubelet
)
getPodVolumePathListFromDisk
(
podUID
types
.
UID
)
([]
string
,
error
)
{
volumes
:=
[]
string
{}
volumes
:=
[]
string
{}
podVolDir
:=
kl
.
getPodVolumesDir
(
podUID
)
podVolDir
:=
kl
.
getPodVolumesDir
(
podUID
)
if
pathExists
,
pathErr
:=
volumeutil
.
PathExists
(
podVolDir
);
pathErr
!=
nil
{
return
volumes
,
fmt
.
Errorf
(
"Error checking if path %q exists: %v"
,
podVolDir
,
pathErr
)
}
else
if
!
pathExists
{
glog
.
Warningf
(
"Warning: path %q does not exist: %q"
,
podVolDir
)
return
volumes
,
nil
}
volumePluginDirs
,
err
:=
ioutil
.
ReadDir
(
podVolDir
)
volumePluginDirs
,
err
:=
ioutil
.
ReadDir
(
podVolDir
)
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Errorf
(
"Could not read directory %s: %v"
,
podVolDir
,
err
)
glog
.
Errorf
(
"Could not read directory %s: %v"
,
podVolDir
,
err
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment