github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Parse the pdName from the volume mount

Browse Source 
Don't assume there are no slashes!
This commit is contained in:
Justin Santa Barbara 2015-04-03 10:03:37 -07:00
parent f0cedd7375
commit cdc569a6c8
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/volume/aws_pd/aws_pd.go
View File

@ -238,6 +238,23 @@ func makeGlobalPDName(host volume.VolumeHost, devName string) string {
return path.Join(host.GetPluginDir(awsPersistentDiskPluginName), "mounts", name)
}
func getPdNameFromGlobalMount(host volume.VolumeHost, globalPath string) (string, error) {
basePath := path.Join(host.GetPluginDir(awsPersistentDiskPluginName), "mounts")
rel, err := filepath.Rel(basePath, globalPath)
if err != nil {
return "", err
}
if strings.Contains(rel, "../") {
return "", fmt.Errorf("Unexpected mount path: " + globalPath)
}
// Reverse the :// replacement done in makeGlobalPDName
name := rel
if strings.HasPrefix(name, "aws/") {
name = strings.Replace(name, "aws/", "aws://")
}
return name, nil
}
func (pd *awsPersistentDisk) GetPath() string {
name := awsPersistentDiskPluginName
return pd.plugin.host.GetPodVolumeDir(pd.podUID, util.EscapeQualifiedNameForDisk(name), pd.volName)
@ -276,7 +293,11 @@ func (pd *awsPersistentDisk) TearDownAt(dir string) error {
// remaining reference is the global mount. It is safe to detach.
if len(refs) == 1 {
// pd.pdName is not initially set for volume-cleaners, so set it here.
pd.pdName = path.Base(refs[0])
pd.pdName, err = getPdNameFromGlobalMount(refs[0])
if err != nil {
glog.V(2).Info("Could not determine pdName from mountpoint ", refs[0], ": ", err)
return err
}
if err := pd.manager.DetachDisk(pd); err != nil {
glog.V(2).Info("Error detaching disk ", pd.pdName, ": ", err)
return err

4
pkg/volume/aws_pd/aws_util.go
View File

@ -101,11 +101,11 @@ func (util *AWSDiskUtil) DetachDisk(pd *awsPersistentDisk) error {
// Detach the disk
volumes, err := pd.getVolumeProvider()
if err != nil {
glog.V(2).Info("Error getting volume provider for pd ", pd.pdName, ": ", err)
glog.V(2).Info("Error getting volume provider for pd ", pd.pdName, ": ", err)
return err
}
if err := volumes.DetachDisk("", pd.pdName); err != nil {
glog.V(2).Info("Error detaching disk ", pd.pdName, ": ", err)
glog.V(2).Info("Error detaching disk ", pd.pdName, ": ", err)
return err
}
return nil