github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 08:09:58 +00:00
Code Issues Projects Releases Wiki Activity

Flush FibreChannel devices before deleting

Browse Source 
If a FibreChannel device is used as a block volume, we should flush its I/O
before deleting its device. It is not strictly necessary when it's used as
a filesystem (mount), but it won't hurt either.
This commit is contained in:
Jan Safranek 2020-12-03 09:53:34 +01:00
parent 6f8bdb7cc1
commit 8f186f9172
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/volume/fc/fc_util.go
View File

@ -112,6 +112,16 @@ func findDiskWWIDs(wwid string, io ioHandler, deviceUtil volumeutil.DeviceUtil)
return "", "" return "", ""
} }
// Flushes any outstanding I/O to the device
func flushDevice(deviceName string, exec utilexec.Interface) {
out, err := exec.Command("blockdev", "--flushbufs", deviceName).CombinedOutput()
if err != nil {
// Ignore the error and continue deleting the device. There is will be no retry on error.
klog.Warningf("Failed to flush device %s: %s\n%s", deviceName, err, string(out))
}
klog.V(4).Infof("Flushed device %s", deviceName)
}
// Removes a scsi device based upon /dev/sdX name // Removes a scsi device based upon /dev/sdX name
func removeFromScsiSubsystem(deviceName string, io ioHandler) { func removeFromScsiSubsystem(deviceName string, io ioHandler) {
fileName := "/sys/block/" + deviceName + "/device/delete" fileName := "/sys/block/" + deviceName + "/device/delete"
@ -268,7 +278,7 @@ func (util *fcUtil) DetachDisk(c fcDiskUnmounter, devicePath string) error {
klog.V(4).Infof("fc: DetachDisk devicePath: %v, dstPath: %v, devices: %v", devicePath, dstPath, devices) klog.V(4).Infof("fc: DetachDisk devicePath: %v, dstPath: %v, devices: %v", devicePath, dstPath, devices)
var lastErr error var lastErr error
for _, device := range devices { for _, device := range devices {
err := util.detachFCDisk(c.io, device) err := util.detachFCDisk(c.io, c.exec, device)
if err != nil { if err != nil {
klog.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err) klog.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err)
lastErr = fmt.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err) lastErr = fmt.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err)
@ -282,11 +292,12 @@ func (util *fcUtil) DetachDisk(c fcDiskUnmounter, devicePath string) error {
} }
// detachFCDisk removes scsi device file such as /dev/sdX from the node. // detachFCDisk removes scsi device file such as /dev/sdX from the node.
func (util *fcUtil) detachFCDisk(io ioHandler, devicePath string) error { func (util *fcUtil) detachFCDisk(io ioHandler, exec utilexec.Interface, devicePath string) error {
// Remove scsi device from the node. // Remove scsi device from the node.
if !strings.HasPrefix(devicePath, "/dev/") { if !strings.HasPrefix(devicePath, "/dev/") {
return fmt.Errorf("fc detach disk: invalid device name: %s", devicePath) return fmt.Errorf("fc detach disk: invalid device name: %s", devicePath)
} }
flushDevice(devicePath, exec)
arr := strings.Split(devicePath, "/") arr := strings.Split(devicePath, "/")
dev := arr[len(arr)-1] dev := arr[len(arr)-1]
removeFromScsiSubsystem(dev, io) removeFromScsiSubsystem(dev, io)
@ -367,7 +378,7 @@ func (util *fcUtil) DetachBlockFCDisk(c fcDiskUnmapper, mapPath, devicePath stri
} }
var lastErr error var lastErr error
for _, device := range devices { for _, device := range devices {
err = util.detachFCDisk(c.io, device) err = util.detachFCDisk(c.io, c.exec, device)
if err != nil { if err != nil {
klog.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err) klog.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err)
lastErr = fmt.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err) lastErr = fmt.Errorf("fc: detachFCDisk failed. device: %v err: %v", device, err)