367f879131
This patch removes mount.Exec entirely and instead uses the common utility from k8s.io/utils/exec. The fake exec implementation found in k8s.io/utils/exec differs a bit than mount.Exec, with the ability to pre-script expected calls to Command.CombinedOutput(), so tests that previously relied on a callback mechanism to produce specific output have been updated to use that mechanism.
87 lines
2.6 KiB
Go
87 lines
2.6 KiB
Go
// +build linux
|
|
|
|
/*
|
|
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 resizefs
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"k8s.io/klog"
|
|
"k8s.io/kubernetes/pkg/util/mount"
|
|
)
|
|
|
|
// ResizeFs Provides support for resizing file systems
|
|
type ResizeFs struct {
|
|
mounter *mount.SafeFormatAndMount
|
|
}
|
|
|
|
// NewResizeFs returns new instance of resizer
|
|
func NewResizeFs(mounter *mount.SafeFormatAndMount) *ResizeFs {
|
|
return &ResizeFs{mounter: mounter}
|
|
}
|
|
|
|
// Resize perform resize of file system
|
|
func (resizefs *ResizeFs) Resize(devicePath string, deviceMountPath string) (bool, error) {
|
|
format, err := resizefs.mounter.GetDiskFormat(devicePath)
|
|
|
|
if err != nil {
|
|
formatErr := fmt.Errorf("ResizeFS.Resize - error checking format for device %s: %v", devicePath, err)
|
|
return false, formatErr
|
|
}
|
|
|
|
// If disk has no format, there is no need to resize the disk because mkfs.*
|
|
// by default will use whole disk anyways.
|
|
if format == "" {
|
|
return false, nil
|
|
}
|
|
|
|
klog.V(3).Infof("ResizeFS.Resize - Expanding mounted volume %s", devicePath)
|
|
switch format {
|
|
case "ext3", "ext4":
|
|
return resizefs.extResize(devicePath)
|
|
case "xfs":
|
|
return resizefs.xfsResize(deviceMountPath)
|
|
}
|
|
return false, fmt.Errorf("ResizeFS.Resize - resize of format %s is not supported for device %s mounted at %s", format, devicePath, deviceMountPath)
|
|
}
|
|
|
|
func (resizefs *ResizeFs) extResize(devicePath string) (bool, error) {
|
|
output, err := resizefs.mounter.Exec.Command("resize2fs", devicePath).CombinedOutput()
|
|
if err == nil {
|
|
klog.V(2).Infof("Device %s resized successfully", devicePath)
|
|
return true, nil
|
|
}
|
|
|
|
resizeError := fmt.Errorf("resize of device %s failed: %v. resize2fs output: %s", devicePath, err, string(output))
|
|
return false, resizeError
|
|
|
|
}
|
|
|
|
func (resizefs *ResizeFs) xfsResize(deviceMountPath string) (bool, error) {
|
|
args := []string{"-d", deviceMountPath}
|
|
output, err := resizefs.mounter.Exec.Command("xfs_growfs", args...).CombinedOutput()
|
|
|
|
if err == nil {
|
|
klog.V(2).Infof("Device %s resized successfully", deviceMountPath)
|
|
return true, nil
|
|
}
|
|
|
|
resizeError := fmt.Errorf("resize of device %s failed: %v. xfs_growfs output: %s", deviceMountPath, err, string(output))
|
|
return false, resizeError
|
|
}
|