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
dd87260d
Commit
dd87260d
authored
Feb 26, 2019
by
David Zhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GetMountRefs fixed to handle corrupted mounts by treating it like an unmounted volume
parent
6c1e64b9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
12 deletions
+19
-12
mount_helper.go
pkg/util/mount/mount_helper.go
+1
-1
mount_linux.go
pkg/util/mount/mount_linux.go
+7
-3
mount_windows.go
pkg/util/mount/mount_windows.go
+7
-3
nsenter_mount.go
pkg/util/mount/nsenter_mount.go
+4
-5
No files found.
pkg/util/mount/mount_helper.go
View file @
dd87260d
...
...
@@ -120,5 +120,5 @@ func IsCorruptedMnt(err error) bool {
underlyingError
=
pe
.
Err
}
return
underlyingError
==
syscall
.
ENOTCONN
||
underlyingError
==
syscall
.
ESTALE
||
underlyingError
==
syscall
.
EIO
return
underlyingError
==
syscall
.
ENOTCONN
||
underlyingError
==
syscall
.
ESTALE
||
underlyingError
==
syscall
.
EIO
||
underlyingError
==
syscall
.
EACCES
}
pkg/util/mount/mount_linux.go
View file @
dd87260d
...
...
@@ -1003,10 +1003,14 @@ func (mounter *Mounter) SafeMakeDir(subdir string, base string, perm os.FileMode
}
func
(
mounter
*
Mounter
)
GetMountRefs
(
pathname
string
)
([]
string
,
error
)
{
if
_
,
err
:=
os
.
Stat
(
pathname
);
os
.
IsNotExist
(
err
)
{
pathExists
,
pathErr
:=
PathExists
(
pathname
)
if
!
pathExists
{
return
[]
string
{},
nil
}
else
if
err
!=
nil
{
return
nil
,
err
}
else
if
IsCorruptedMnt
(
pathErr
)
{
klog
.
Warningf
(
"GetMountRefs found corrupted mount at %s, treating as unmounted path"
,
pathname
)
return
[]
string
{},
nil
}
else
if
pathErr
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"error checking path %s: %v"
,
pathname
,
pathErr
)
}
realpath
,
err
:=
filepath
.
EvalSymlinks
(
pathname
)
if
err
!=
nil
{
...
...
pkg/util/mount/mount_windows.go
View file @
dd87260d
...
...
@@ -496,10 +496,14 @@ func getAllParentLinks(path string) ([]string, error) {
// GetMountRefs : empty implementation here since there is no place to query all mount points on Windows
func
(
mounter
*
Mounter
)
GetMountRefs
(
pathname
string
)
([]
string
,
error
)
{
if
_
,
err
:=
os
.
Stat
(
normalizeWindowsPath
(
pathname
));
os
.
IsNotExist
(
err
)
{
pathExists
,
pathErr
:=
PathExists
(
normalizeWindowsPath
(
pathname
))
// TODO(#75012): Need a Windows specific IsCorruptedMnt function that checks against whatever errno's
// Windows emits when we try to Stat a corrupted mount
// https://golang.org/pkg/syscall/?GOOS=windows&GOARCH=amd64#Errno
if
!
pathExists
{
return
[]
string
{},
nil
}
else
if
e
rr
!=
nil
{
return
nil
,
err
}
else
if
pathE
rr
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"error checking path %s: %v"
,
normalizeWindowsPath
(
pathname
),
pathErr
)
}
return
[]
string
{
pathname
},
nil
}
...
...
pkg/util/mount/nsenter_mount.go
View file @
dd87260d
...
...
@@ -344,12 +344,11 @@ func (mounter *NsenterMounter) SafeMakeDir(subdir string, base string, perm os.F
}
func
(
mounter
*
NsenterMounter
)
GetMountRefs
(
pathname
string
)
([]
string
,
error
)
{
exists
,
err
:=
mounter
.
ExistsPath
(
pathname
)
if
err
!=
nil
{
return
nil
,
err
}
if
!
exists
{
pathExists
,
pathErr
:=
PathExists
(
pathname
)
if
!
pathExists
||
IsCorruptedMnt
(
pathErr
)
{
return
[]
string
{},
nil
}
else
if
pathErr
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"Error checking path %s: %v"
,
pathname
,
pathErr
)
}
hostpath
,
err
:=
mounter
.
ne
.
EvalSymlinks
(
pathname
,
true
/* mustExist */
)
if
err
!=
nil
{
...
...
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