mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-03 23:40:03 +00:00
0c5c3d8bb9
This patch removes pkg/util/mount completely, and replaces it with the mount package now located at k8s.io/utils/mount. The code found at k8s.io/utils/mount was moved there from pkg/util/mount, so the code is identical, just no longer in-tree to k/k.
96 lines
2.5 KiB
Go
96 lines
2.5 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package flexvolume
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"k8s.io/klog"
|
|
"k8s.io/utils/mount"
|
|
|
|
"k8s.io/apimachinery/pkg/types"
|
|
"k8s.io/kubernetes/pkg/volume"
|
|
)
|
|
|
|
type flexVolumeDetacher struct {
|
|
plugin *flexVolumeAttachablePlugin
|
|
}
|
|
|
|
var _ volume.Detacher = &flexVolumeDetacher{}
|
|
|
|
var _ volume.DeviceUnmounter = &flexVolumeDetacher{}
|
|
|
|
// Detach is part of the volume.Detacher interface.
|
|
func (d *flexVolumeDetacher) Detach(volumeName string, hostName types.NodeName) error {
|
|
|
|
call := d.plugin.NewDriverCall(detachCmd)
|
|
call.Append(volumeName)
|
|
call.Append(string(hostName))
|
|
|
|
_, err := call.Run()
|
|
if isCmdNotSupportedErr(err) {
|
|
return (*detacherDefaults)(d).Detach(volumeName, hostName)
|
|
}
|
|
return err
|
|
}
|
|
|
|
// UnmountDevice is part of the volume.Detacher interface.
|
|
func (d *flexVolumeDetacher) UnmountDevice(deviceMountPath string) error {
|
|
|
|
pathExists, pathErr := mount.PathExists(deviceMountPath)
|
|
if !pathExists {
|
|
klog.Warningf("Warning: Unmount skipped because path does not exist: %v", deviceMountPath)
|
|
return nil
|
|
}
|
|
if pathErr != nil && !mount.IsCorruptedMnt(pathErr) {
|
|
return fmt.Errorf("Error checking path: %v", pathErr)
|
|
}
|
|
|
|
notmnt, err := isNotMounted(d.plugin.host.GetMounter(d.plugin.GetPluginName()), deviceMountPath)
|
|
if err != nil {
|
|
if mount.IsCorruptedMnt(err) {
|
|
notmnt = false // Corrupted error is assumed to be mounted.
|
|
} else {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if notmnt {
|
|
klog.Warningf("Warning: Path: %v already unmounted", deviceMountPath)
|
|
} else {
|
|
call := d.plugin.NewDriverCall(unmountDeviceCmd)
|
|
call.Append(deviceMountPath)
|
|
|
|
_, err := call.Run()
|
|
if isCmdNotSupportedErr(err) {
|
|
err = (*detacherDefaults)(d).UnmountDevice(deviceMountPath)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// Flexvolume driver may remove the directory. Ignore if it does.
|
|
if pathExists, pathErr := mount.PathExists(deviceMountPath); pathErr != nil {
|
|
return fmt.Errorf("Error checking if path exists: %v", pathErr)
|
|
} else if !pathExists {
|
|
return nil
|
|
}
|
|
return os.Remove(deviceMountPath)
|
|
}
|