github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3964 from brendandburns/fixer

Browse Source 
Reverse the order of detaching and removing the pd disk.
This commit is contained in:
Satnam Singh 2015-01-29 16:47:27 -08:00
commit 08ce8e80ad
1 changed files with 3 additions and 3 deletions
Show Stats 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
} }