
Adds GCEPersistentDisk volume struct Adds gce-utils to attach disk to kubelet's VM. Updates config to give compute-rw to every minion. Adds GCEPersistentDisk to API Adds ability to mount attached disks Generalizes PD and adds tests. PD now uses an pluggable API interface. Unit Tests more cleanly separates TearDown and SetUp Modify boilerplate hook to omit build tags Adds Mounter interface; mount is now built by OS TearDown() for PD now detaches disk on final refcount Un-generalized PD; GCE calls moved to cloudprovider Address comments.
227 lines
5.7 KiB
Go
227 lines
5.7 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 volume
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"os"
|
|
"path"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
)
|
|
|
|
type MockDiskUtil struct{}
|
|
|
|
// TODO(jonesdl) To fully test this, we could create a loopback device
|
|
// and mount that instead.
|
|
func (util *MockDiskUtil) AttachDisk(PD *GCEPersistentDisk) error {
|
|
err := os.MkdirAll(path.Join(PD.RootDir, "global", "pd", PD.PDName), 0750)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (util *MockDiskUtil) DetachDisk(PD *GCEPersistentDisk, devicePath string) error {
|
|
err := os.RemoveAll(path.Join(PD.RootDir, "global", "pd", PD.PDName))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type MockMounter struct{}
|
|
|
|
func (mounter *MockMounter) Mount(source string, target string, fstype string, flags uintptr, data string) error {
|
|
return nil
|
|
}
|
|
|
|
func (mounter *MockMounter) Unmount(target string, flags int) error {
|
|
return nil
|
|
}
|
|
|
|
func (mounter *MockMounter) RefCount(vol Interface) (string, int, error) {
|
|
return "", 0, nil
|
|
}
|
|
|
|
func TestCreateVolumeBuilders(t *testing.T) {
|
|
tempDir := "CreateVolumes"
|
|
createVolumesTests := []struct {
|
|
volume api.Volume
|
|
path string
|
|
podID string
|
|
}{
|
|
{
|
|
api.Volume{
|
|
Name: "host-dir",
|
|
Source: &api.VolumeSource{
|
|
HostDir: &api.HostDir{"/dir/path"},
|
|
},
|
|
},
|
|
"/dir/path",
|
|
"",
|
|
},
|
|
{
|
|
api.Volume{
|
|
Name: "empty-dir",
|
|
Source: &api.VolumeSource{
|
|
EmptyDir: &api.EmptyDir{},
|
|
},
|
|
},
|
|
path.Join(tempDir, "/my-id/volumes/empty/empty-dir"),
|
|
"my-id",
|
|
},
|
|
{
|
|
api.Volume{
|
|
Name: "gce-pd",
|
|
Source: &api.VolumeSource{
|
|
GCEPersistentDisk: &api.GCEPersistentDisk{"my-disk", "ext4", 0, false},
|
|
},
|
|
},
|
|
path.Join(tempDir, "/my-id/volumes/gce-pd/gce-pd"),
|
|
"my-id",
|
|
},
|
|
{api.Volume{}, "", ""},
|
|
{
|
|
api.Volume{
|
|
Name: "empty-dir",
|
|
Source: &api.VolumeSource{},
|
|
},
|
|
"",
|
|
"",
|
|
},
|
|
}
|
|
for _, createVolumesTest := range createVolumesTests {
|
|
tt := createVolumesTest
|
|
vb, err := CreateVolumeBuilder(&tt.volume, tt.podID, tempDir)
|
|
if tt.volume.Source == nil {
|
|
if vb != nil {
|
|
t.Errorf("Expected volume to be nil")
|
|
}
|
|
continue
|
|
}
|
|
if tt.volume.Source.HostDir == nil && tt.volume.Source.EmptyDir == nil && tt.volume.Source.GCEPersistentDisk == nil {
|
|
if err != ErrUnsupportedVolumeType {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
}
|
|
continue
|
|
}
|
|
if err != nil {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
}
|
|
path := vb.GetPath()
|
|
if path != tt.path {
|
|
t.Errorf("Unexpected bind path. Expected %v, got %v", tt.path, path)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestCreateVolumeCleaners(t *testing.T) {
|
|
tempDir := "CreateVolumeCleaners"
|
|
createVolumeCleanerTests := []struct {
|
|
kind string
|
|
name string
|
|
podID string
|
|
}{
|
|
{"empty", "empty-vol", "my-id"},
|
|
{"", "", ""},
|
|
{"gce-pd", "gce-pd-vol", "my-id"},
|
|
}
|
|
for _, tt := range createVolumeCleanerTests {
|
|
vol, err := CreateVolumeCleaner(tt.kind, tt.name, tt.podID, tempDir)
|
|
if tt.kind == "" && err != nil && vol == nil {
|
|
continue
|
|
}
|
|
if err != nil {
|
|
t.Errorf("Unexpected error occured: %s", err)
|
|
}
|
|
actualKind := reflect.TypeOf(vol).Elem().Name()
|
|
if tt.kind == "empty" && actualKind != "EmptyDir" {
|
|
t.Errorf("CreateVolumeCleaner returned invalid type. Expected EmptyDirectory, got %v, %v", tt.kind, actualKind)
|
|
}
|
|
if tt.kind == "gce-pd" && actualKind != "GCEPersistentDisk" {
|
|
t.Errorf("CreateVolumeCleaner returned invalid type. Expected PersistentDisk, got %v, %v", tt.kind, actualKind)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestSetUpAndTearDown(t *testing.T) {
|
|
tempDir, err := ioutil.TempDir("", "CreateVolumes")
|
|
if err != nil {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
}
|
|
defer os.RemoveAll(tempDir)
|
|
fakeID := "my-id"
|
|
type VolumeTester interface {
|
|
Builder
|
|
Cleaner
|
|
}
|
|
volumes := []VolumeTester{
|
|
&EmptyDir{"empty", fakeID, tempDir},
|
|
&GCEPersistentDisk{"pd", fakeID, tempDir, "pd-disk", "ext4", "", false, &MockDiskUtil{}, &MockMounter{}},
|
|
}
|
|
|
|
for _, vol := range volumes {
|
|
err = vol.SetUp()
|
|
path := vol.GetPath()
|
|
if err != nil {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
}
|
|
if _, err := os.Stat(path); os.IsNotExist(err) {
|
|
t.Errorf("SetUp() failed, volume path not created: %v", path)
|
|
}
|
|
err = vol.TearDown()
|
|
if err != nil {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
}
|
|
if _, err := os.Stat(path); !os.IsNotExist(err) {
|
|
t.Errorf("TearDown() failed, original volume path not properly removed: %v", path)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestGetActiveVolumes(t *testing.T) {
|
|
tempDir, err := ioutil.TempDir("", "CreateVolumes")
|
|
if err != nil {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
}
|
|
defer os.RemoveAll(tempDir)
|
|
getActiveVolumesTests := []struct {
|
|
name string
|
|
podID string
|
|
kind string
|
|
identifier string
|
|
}{
|
|
{"fakeName", "fakeID", "empty", "fakeID/fakeName"},
|
|
{"fakeName2", "fakeID2", "empty", "fakeID2/fakeName2"},
|
|
}
|
|
expectedIdentifiers := []string{}
|
|
for _, test := range getActiveVolumesTests {
|
|
volumeDir := path.Join(tempDir, test.podID, "volumes", test.kind, test.name)
|
|
os.MkdirAll(volumeDir, 0750)
|
|
expectedIdentifiers = append(expectedIdentifiers, test.identifier)
|
|
}
|
|
volumeMap := GetCurrentVolumes(tempDir)
|
|
for _, name := range expectedIdentifiers {
|
|
if _, ok := volumeMap[name]; !ok {
|
|
t.Errorf("Expected volume map entry not found: %v", name)
|
|
}
|
|
}
|
|
}
|