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

Merge pull request #19239 from markturansky/fixup_pv_controllers

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-13 21:34:05 -08:00
parent dc36f3a7f4 50d83f3851
commit 6a5ea5ec04
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go
View File

@@ -156,6 +156,7 @@ func (binder *PersistentVolumeClaimBinder) updateClaim(oldObj, newObj interface{
newClaim, ok := newObj.(*api.PersistentVolumeClaim) newClaim, ok := newObj.(*api.PersistentVolumeClaim)
if !ok { if !ok {
glog.Errorf("Expected PersistentVolumeClaim but handler received %+v", newObj) glog.Errorf("Expected PersistentVolumeClaim but handler received %+v", newObj)
return
} }
if err := syncClaim(binder.volumeIndex, binder.client, newClaim); err != nil { if err := syncClaim(binder.volumeIndex, binder.client, newClaim); err != nil {
glog.Errorf("PVClaimBinder could not update claim %s: %+v", newClaim.Name, err) glog.Errorf("PVClaimBinder could not update claim %s: %+v", newClaim.Name, err)

2
pkg/controller/persistentvolume/persistentvolume_recycler_controller.go
View File

@@ -77,6 +77,7 @@ func NewPersistentVolumeRecycler(kubeClient client.Interface, syncPeriod time.Du
pv, ok := obj.(*api.PersistentVolume) pv, ok := obj.(*api.PersistentVolume)
if !ok { if !ok {
glog.Errorf("Error casting object to PersistentVolume: %v", obj) glog.Errorf("Error casting object to PersistentVolume: %v", obj)
return
} }
recycler.reclaimVolume(pv) recycler.reclaimVolume(pv)
}, },
@@ -84,6 +85,7 @@ func NewPersistentVolumeRecycler(kubeClient client.Interface, syncPeriod time.Du
pv, ok := newObj.(*api.PersistentVolume) pv, ok := newObj.(*api.PersistentVolume)
if !ok { if !ok {
glog.Errorf("Error casting object to PersistentVolume: %v", newObj) glog.Errorf("Error casting object to PersistentVolume: %v", newObj)
return
} }
recycler.reclaimVolume(pv) recycler.reclaimVolume(pv)
}, },