
Fix readonly PD attach (don't try to format). Add an e2e test to verify that PDs are attached and detached correctly. Add an e2e test to verify that readonly PDs can be attached to >1 pods.
143 lines
4.2 KiB
Go
143 lines
4.2 KiB
Go
/*
|
|
Copyright 2014 Google Inc. 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 gce_pd
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
"time"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/gce"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount"
|
|
"github.com/golang/glog"
|
|
)
|
|
|
|
type GCEDiskUtil struct{}
|
|
|
|
// Attaches a disk specified by a volume.GCEPersistentDisk to the current kubelet.
|
|
// Mounts the disk to it's global path.
|
|
func (util *GCEDiskUtil) AttachAndMountDisk(pd *gcePersistentDisk, globalPDPath string) error {
|
|
gce, err := cloudprovider.GetCloudProvider("gce", nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
flags := uintptr(0)
|
|
if pd.readOnly {
|
|
flags = mount.FlagReadOnly
|
|
}
|
|
if err := gce.(*gce_cloud.GCECloud).AttachDisk(pd.pdName, pd.readOnly); err != nil {
|
|
return err
|
|
}
|
|
devicePath := path.Join("/dev/disk/by-id/", "google-"+pd.pdName)
|
|
if pd.partition != "" {
|
|
devicePath = devicePath + "-part" + pd.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")
|
|
}
|
|
time.Sleep(time.Second)
|
|
}
|
|
|
|
// Only mount the PD globally once.
|
|
mountpoint, err := isMountPoint(globalPDPath)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
if err := os.MkdirAll(globalPDPath, 0750); err != nil {
|
|
return err
|
|
}
|
|
mountpoint = false
|
|
} else {
|
|
return err
|
|
}
|
|
}
|
|
if !mountpoint {
|
|
err = pd.diskMounter.Mount(devicePath, globalPDPath, pd.fsType, flags, "")
|
|
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 *GCEDiskUtil) DetachDisk(pd *gcePersistentDisk) error {
|
|
// Unmount the global PD mount, which should be the only one.
|
|
globalPDPath := makeGlobalPDName(pd.plugin.host, pd.pdName)
|
|
if err := pd.mounter.Unmount(globalPDPath, 0); err != nil {
|
|
return err
|
|
}
|
|
if err := os.Remove(globalPDPath); err != nil {
|
|
return err
|
|
}
|
|
// Detach the disk
|
|
gce, err := cloudprovider.GetCloudProvider("gce", nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := gce.(*gce_cloud.GCECloud).DetachDisk(pd.pdName); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// safe_format_and_mount is a utility script on GCE VMs that probes a persistent disk, and if
|
|
// necessary formats it before mounting it.
|
|
// This eliminates the necesisty to format a PD before it is used with a Pod on GCE.
|
|
// TODO: port this script into Go and use it for all Linux platforms
|
|
type gceSafeFormatAndMount struct {
|
|
mount.Interface
|
|
runner exec.Interface
|
|
}
|
|
|
|
// uses /usr/share/google/safe_format_and_mount to optionally mount, and format a disk
|
|
func (mounter *gceSafeFormatAndMount) Mount(source string, target string, fstype string, flags uintptr, data string) error {
|
|
// Don't attempt to format if mounting as readonly. Go straight to mounting.
|
|
if (flags & mount.FlagReadOnly) != 0 {
|
|
return mounter.Interface.Mount(source, target, fstype, flags, data)
|
|
}
|
|
args := []string{}
|
|
// ext4 is the default for safe_format_and_mount
|
|
if len(fstype) > 0 && fstype != "ext4" {
|
|
args = append(args, "-m", fmt.Sprintf("mkfs.%s", fstype))
|
|
}
|
|
args = append(args, source, target)
|
|
// TODO: Accept other options here?
|
|
glog.V(5).Infof("exec-ing: /usr/share/google/safe_format_and_mount %v", args)
|
|
cmd := mounter.runner.Command("/usr/share/google/safe_format_and_mount", args...)
|
|
dataOut, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
glog.V(5).Infof("error running /usr/share/google/safe_format_and_mount\n%s", string(dataOut))
|
|
}
|
|
return err
|
|
}
|