github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Factor mount utility code out gce_pd volume plugin

pull/6/head
Paul Morie 2015-03-04 13:29:01 -05:00
parent 9fcb48cab6
commit 8ef04a8425
12 changed files with 135 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/volume/gce_pd/gce_pd.go
View File

@ -170,7 +170,7 @@ func (pd *gcePersistentDisk) SetUp() error {
}
// TODO: handle failed mounts here.
mountpoint, err := isMountPoint(pd.GetPath())
mountpoint, err := mount.IsMountPoint(pd.GetPath())
glog.V(4).Infof("PersistentDisk set up: %s %v %v", pd.GetPath(), mountpoint, err)
if err != nil && !os.IsNotExist(err) {
return err
@ -199,7 +199,7 @@ func (pd *gcePersistentDisk) SetUp() error {
// Perform a bind mount to the full path to allow duplicate mounts of the same PD.
err = pd.mounter.Mount(globalPDPath, pd.GetPath(), "", mount.FlagBind|flags, "")
if err != nil {
mountpoint, mntErr := isMountPoint(pd.GetPath())
mountpoint, mntErr := mount.IsMountPoint(pd.GetPath())
if mntErr != nil {
glog.Errorf("isMountpoint check failed: %v", mntErr)
return err
@ -209,7 +209,7 @@ func (pd *gcePersistentDisk) SetUp() error {
glog.Errorf("Failed to unmount: %v", mntErr)
return err
}
mountpoint, mntErr := isMountPoint(pd.GetPath())
mountpoint, mntErr := mount.IsMountPoint(pd.GetPath())
if mntErr != nil {
glog.Errorf("isMountpoint check failed: %v", mntErr)
return err
@ -244,7 +244,7 @@ func (pd *gcePersistentDisk) GetPath() string {
// Unmounts the bind mount, and detaches the disk only if the PD
// resource was the last reference to that disk on the kubelet.
func (pd *gcePersistentDisk) TearDown() error {
mountpoint, err := isMountPoint(pd.GetPath())
mountpoint, err := mount.IsMountPoint(pd.GetPath())
if err != nil {
return err
}
@ -252,7 +252,7 @@ func (pd *gcePersistentDisk) TearDown() error {
return os.Remove(pd.GetPath())
}
refs, err := getMountRefs(pd.mounter, pd.GetPath())
refs, err := mount.GetMountRefs(pd.mounter, pd.GetPath())
if err != nil {
return err
}
@ -269,7 +269,7 @@ func (pd *gcePersistentDisk) TearDown() error {
return err
}
}
mountpoint, mntErr := isMountPoint(pd.GetPath())
mountpoint, mntErr := mount.IsMountPoint(pd.GetPath())
if mntErr != nil {
glog.Errorf("isMountpoint check failed: %v", mntErr)
return err

5
pkg/kubelet/volume/gce_pd/gce_pd_test.go
View File

@ -23,6 +23,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume"
"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount"
)
func TestCanSupport(t *testing.T) {
@ -80,7 +81,7 @@ func TestPlugin(t *testing.T) {
},
},
}
builder, err := plug.(*gcePersistentDiskPlugin).newBuilderInternal(spec, types.UID("poduid"), &fakePDManager{}, &fakeMounter{})
builder, err := plug.(*gcePersistentDiskPlugin).newBuilderInternal(spec, types.UID("poduid"), &fakePDManager{}, &mount.FakeMounter{})
if err != nil {
t.Errorf("Failed to make a new Builder: %v", err)
}
@ -111,7 +112,7 @@ func TestPlugin(t *testing.T) {
}
}
cleaner, err := plug.(*gcePersistentDiskPlugin).newCleanerInternal("vol1", types.UID("poduid"), &fakePDManager{}, &fakeMounter{})
cleaner, err := plug.(*gcePersistentDiskPlugin).newCleanerInternal("vol1", types.UID("poduid"), &fakePDManager{}, &mount.FakeMounter{})
if err != nil {
t.Errorf("Failed to make a new Cleaner: %v", err)
}

2
pkg/kubelet/volume/gce_pd/gce_util.go
View File

@ -68,7 +68,7 @@ func (util *GCEDiskUtil) AttachAndMountDisk(pd *gcePersistentDisk, globalPDPath
}
// Only mount the PD globally once.
mountpoint, err := isMountPoint(globalPDPath)
mountpoint, err := mount.IsMountPoint(globalPDPath)
if err != nil {
if os.IsNotExist(err) {
if err := os.MkdirAll(globalPDPath, 0750); err != nil {

48
pkg/kubelet/volume/gce_pd/mount_util.go
View File

@ -1,48 +0,0 @@
/*
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 (
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount"
)
// Examines /proc/mounts to find all other references to the device referenced
// by mountPath.
func getMountRefs(mounter mount.Interface, mountPath string) ([]string, error) {
mps, err := mounter.List()
if err != nil {
return nil, err
}
// Find the device name.
deviceName := ""
for i := range mps {
if mps[i].Path == mountPath {
deviceName = mps[i].Device
break
}
}
// Find all references to the device.
var refs []string
for i := range mps {
if mps[i].Device == deviceName && mps[i].Path != mountPath {
refs = append(refs, mps[i].Path)
}
}
return refs, nil
}

99
pkg/kubelet/volume/gce_pd/mount_util_test.go
View File

@ -1,99 +0,0 @@
/*
Copyright 2015 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 (
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount"
)
type fakeMounter struct {
mountPoints []mount.MountPoint
}
func (f *fakeMounter) Mount(source string, target string, fstype string, flags uintptr, data string) error {
return nil
}
func (f *fakeMounter) Unmount(target string, flags int) error {
return nil
}
func (f *fakeMounter) List() ([]mount.MountPoint, error) {
return f.mountPoints, nil
}
func TestGetMountRefs(t *testing.T) {
fm := &fakeMounter{
[]mount.MountPoint{
{Device: "/dev/sdb", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd"},
{Device: "/dev/sdb", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod"},
{Device: "/dev/sdc", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2"},
{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod"},
{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2"},
},
}
tests := []struct {
mountPath string
expectedRefs []string
}{
{
"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod",
[]string{
"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd",
},
},
{
"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod",
[]string{
"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2",
"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2",
},
},
}
for i, test := range tests {
if refs, err := getMountRefs(fm, test.mountPath); err != nil || !setEquivalent(test.expectedRefs, refs) {
t.Errorf("%d. getMountRefs(%q) = %v, %v; expected %v, nil", i, test.mountPath, refs, err, test.expectedRefs)
}
}
}
func setEquivalent(set1, set2 []string) bool {
map1 := make(map[string]bool)
map2 := make(map[string]bool)
for _, s := range set1 {
map1[s] = true
}
for _, s := range set2 {
map2[s] = true
}
for s := range map1 {
if !map2[s] {
return false
}
}
for s := range map2 {
if !map1[s] {
return false
}
}
return true
}

34
pkg/util/mount/fake.go Normal file
View File

@ -0,0 +1,34 @@
/*
Copyright 2015 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 mount
// FakeMounter implements mount.Interface.
type FakeMounter struct {
mountPoints []MountPoint
}
func (f *FakeMounter) Mount(source string, target string, fstype string, flags uintptr, data string) error {
return nil
}
func (f *FakeMounter) Unmount(target string, flags int) error {
return nil
}
func (f *FakeMounter) List() ([]MountPoint, error) {
return f.mountPoints, nil
}

27
pkg/util/mount/mount.go
View File

@ -49,3 +49,30 @@ type MountPoint struct {
Freq int
Pass int
}
// Examines /proc/mounts to find all other references to the device referenced
// by mountPath.
func GetMountRefs(mounter Interface, mountPath string) ([]string, error) {
mps, err := mounter.List()
if err != nil {
return nil, err
}
// Find the device name.
deviceName := ""
for i := range mps {
if mps[i].Path == mountPath {
deviceName = mps[i].Device
break
}
}
// Find all references to the device.
var refs []string
for i := range mps {
if mps[i].Device == deviceName && mps[i].Path != mountPath {
refs = append(refs, mps[i].Path)
}
}
return refs, nil
}

0
pkg/util/mount/linux.go → pkg/util/mount/mount_linux.go
View File

60
pkg/util/mount/linux_test.go → pkg/util/mount/mount_linux_test.go
View File

@ -91,3 +91,63 @@ func slicesEqual(a, b []string) bool {
}
return true
}
func TestGetMountRefs(t *testing.T) {
fm := &FakeMounter{
[]MountPoint{
{Device: "/dev/sdb", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd"},
{Device: "/dev/sdb", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod"},
{Device: "/dev/sdc", Path: "/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2"},
{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod"},
{Device: "/dev/sdc", Path: "/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2"},
},
}
tests := []struct {
mountPath string
expectedRefs []string
}{
{
"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd-in-pod",
[]string{
"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd",
},
},
{
"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod",
[]string{
"/var/lib/kubelet/pods/some-pod/volumes/kubernetes.io~gce-pd/gce-pd2-in-pod2",
"/var/lib/kubelet/plugins/kubernetes.io/gce-pd/mounts/gce-pd2",
},
},
}
for i, test := range tests {
if refs, err := GetMountRefs(fm, test.mountPath); err != nil || !setEquivalent(test.expectedRefs, refs) {
t.Errorf("%d. getMountRefs(%q) = %v, %v; expected %v, nil", i, test.mountPath, refs, err, test.expectedRefs)
}
}
}
func setEquivalent(set1, set2 []string) bool {
map1 := make(map[string]bool)
map2 := make(map[string]bool)
for _, s := range set1 {
map1[s] = true
}
for _, s := range set2 {
map2[s] = true
}
for s := range map1 {
if !map2[s] {
return false
}
}
for s := range map2 {
if !map1[s] {
return false
}
}
return true
}

0
pkg/util/mount/unsupported.go → pkg/util/mount/mount_unsupported.go
View File

4
pkg/kubelet/volume/gce_pd/mount_util_unix.go → pkg/util/mount/mountpoint_unix.go
View File

@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package gce_pd
package mount
import (
"os"
@ -26,7 +26,7 @@ import (
// Determine if a directory is a mountpoint, by comparing the device for the directory
// with the device for it's parent. If they are the same, it's not a mountpoint, if they're
// different, it is.
func isMountPoint(file string) (bool, error) {
func IsMountPoint(file string) (bool, error) {
stat, err := os.Stat(file)
if err != nil {
return false, err

4
pkg/kubelet/volume/gce_pd/mount_util_unsupported.go → pkg/util/mount/mountpoint_unsupported.go
View File

@ -16,13 +16,13 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package gce_pd
package mount
import (
"fmt"
)
// Dummy implementation for Windows
func isMountPoint(file string) (bool, error) {
func IsMountPoint(file string) (bool, error) {
return false, fmt.Errorf("unimplemented")
}