github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverse the order of unmounting and removing the pd disk.

Browse Source 
This should mean that we retry detaching if the original detach fails for some reason.
This commit is contained in:
Brendan Burns
2015-01-29 16:13:12 -08:00
parent 0345211e0c
commit a0b8429d2e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,9 +234,6 @@ func (pd *gcePersistentDisk) TearDown() error {
return err return err
} }
refCount-- refCount--
if err := os.RemoveAll(pd.GetPath()); err != nil {
return err
}
// If refCount is 1, then all bind mounts have been removed, and the // If refCount is 1, then all bind mounts have been removed, and the
// remaining reference is the global mount. It is safe to detach. // remaining reference is the global mount. It is safe to detach.
if refCount == 1 { if refCount == 1 {
@@ -244,5 +241,8 @@ func (pd *gcePersistentDisk) TearDown() error {
return err return err
} }
} }
if err := os.RemoveAll(pd.GetPath()); err != nil {
return err
}
return nil return nil
} }