ab0258f259
The GCE PD plugin uses safe_format_and_mount found on standard GCE images: https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google-startup-scripts/usr/share/google/safe_format_and_mount On custom images where this is not available pods fail to format and mount GCE PDs. This patch uses linux utilities in a similar way to the safe_format_and_mount script to format and mount the GCE PD and AWS EBC devices. That is first attempt a mount. If mount fails try to use file to investigate the device. If 'file' fails to get any information about the device and simply returns "data" then assume the device is not formatted and format it and attempt to mount it again. Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
110 lines
2.9 KiB
Go
110 lines
2.9 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors All rights reserved.
|
|
|
|
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 aws_ebs
|
|
|
|
import (
|
|
"errors"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/golang/glog"
|
|
)
|
|
|
|
type AWSDiskUtil struct{}
|
|
|
|
// Attaches a disk specified by a volume.AWSElasticBlockStore to the current kubelet.
|
|
// Mounts the disk to it's global path.
|
|
func (util *AWSDiskUtil) AttachAndMountDisk(b *awsElasticBlockStoreBuilder, globalPDPath string) error {
|
|
volumes, err := b.getVolumeProvider()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
devicePath, err := volumes.AttachDisk("", b.volumeID, b.readOnly)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if b.partition != "" {
|
|
devicePath = devicePath + b.partition
|
|
}
|
|
//TODO(jonesdl) There should probably be better method than busy-waiting here.
|
|
numTries := 0
|
|
for {
|
|
_, err := os.Stat(devicePath)
|
|
if err == nil {
|
|
break
|
|
}
|
|
if err != nil && !os.IsNotExist(err) {
|
|
return err
|
|
}
|
|
numTries++
|
|
if numTries == 10 {
|
|
return errors.New("Could not attach disk: Timeout after 10s (" + devicePath + ")")
|
|
}
|
|
time.Sleep(time.Second)
|
|
}
|
|
|
|
// Only mount the PD globally once.
|
|
notMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
if err := os.MkdirAll(globalPDPath, 0750); err != nil {
|
|
return err
|
|
}
|
|
notMnt = true
|
|
} else {
|
|
return err
|
|
}
|
|
}
|
|
options := []string{}
|
|
if b.readOnly {
|
|
options = append(options, "ro")
|
|
}
|
|
if notMnt {
|
|
err = b.diskMounter.Mount(devicePath, globalPDPath, b.fsType, options)
|
|
if err != nil {
|
|
os.Remove(globalPDPath)
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Unmounts the device and detaches the disk from the kubelet's host machine.
|
|
func (util *AWSDiskUtil) DetachDisk(c *awsElasticBlockStoreCleaner) error {
|
|
// Unmount the global PD mount, which should be the only one.
|
|
globalPDPath := makeGlobalPDPath(c.plugin.host, c.volumeID)
|
|
if err := c.mounter.Unmount(globalPDPath); err != nil {
|
|
glog.V(2).Info("Error unmount dir ", globalPDPath, ": ", err)
|
|
return err
|
|
}
|
|
if err := os.Remove(globalPDPath); err != nil {
|
|
glog.V(2).Info("Error removing dir ", globalPDPath, ": ", err)
|
|
return err
|
|
}
|
|
// Detach the disk
|
|
volumes, err := c.getVolumeProvider()
|
|
if err != nil {
|
|
glog.V(2).Info("Error getting volume provider for volumeID ", c.volumeID, ": ", err)
|
|
return err
|
|
}
|
|
if err := volumes.DetachDisk("", c.volumeID); err != nil {
|
|
glog.V(2).Info("Error detaching disk ", c.volumeID, ": ", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|