github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96889 from jsafrane/fix-kubelet-symlink

Browse Source 
Fix loopback device lookup
This commit is contained in:
Kubernetes Prow Robot 2021-01-05 20:57:51 -08:00 committed by GitHub
commit 39483aa095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/volume/util/volumepathhandler/volume_path_handler_linux.go
View File

@ -131,6 +131,11 @@ func parseLosetupOutputForDevice(output []byte, path string) (string, error) {
return "", errors.New(ErrDeviceNotFound)
}
realPath, err := filepath.EvalSymlinks(path)
if err != nil {
return "", fmt.Errorf("failed to evaluate path %s: %s", path, err)
}
// losetup -j {path} returns device in the format:
// /dev/loop1: [0073]:148662 ({path})
// /dev/loop2: [0073]:148662 (/dev/sdX)
@ -143,6 +148,12 @@ func parseLosetupOutputForDevice(output []byte, path string) (string, error) {
var matched string
scanner := bufio.NewScanner(strings.NewReader(s))
for scanner.Scan() {
// losetup output has symlinks expanded
if strings.HasSuffix(scanner.Text(), "("+realPath+")") {
matched = scanner.Text()
break
}
// Just in case losetup changes, check for the original path too
if strings.HasSuffix(scanner.Text(), "("+path+")") {
matched = scanner.Text()
break