github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Optimize provisioner plugin result check logic

Browse Source 
If err is not returned by findProvisionablePlugin(...), storageClass is certainly not nil
This commit is contained in:
NickrenREN 2017-05-26 11:29:19 +08:00
parent 95a6f108bd
commit 51e2336476
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/controller/volume/persistentvolume/pv_controller.go
View File

@ -1259,28 +1259,22 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation(claimObj interfa
return return
} }
if storageClass != nil { // Add provisioner annotation so external provisioners know when to start
// Add provisioner annotation so external provisioners know when to start newClaim, err := ctrl.setClaimProvisioner(claim, storageClass)
newClaim, err := ctrl.setClaimProvisioner(claim, storageClass) if err != nil {
if err != nil { // Save failed, the controller will retry in the next sync
// Save failed, the controller will retry in the next sync glog.V(2).Infof("error saving claim %s: %v", claimToClaimKey(claim), err)
glog.V(2).Infof("error saving claim %s: %v", claimToClaimKey(claim), err) return
return
}
claim = newClaim
} }
claim = newClaim
if plugin == nil { if plugin == nil {
// findProvisionablePlugin returned no error nor plugin. // findProvisionablePlugin returned no error nor plugin.
// This means that an unknown provisioner is requested. Report an event // This means that an unknown provisioner is requested. Report an event
// and wait for the external provisioner // and wait for the external provisioner
if storageClass != nil { msg := fmt.Sprintf("waiting for a volume to be created, either by external provisioner %q or manually created by system administrator", storageClass.Provisioner)
msg := fmt.Sprintf("waiting for a volume to be created, either by external provisioner %q or manually created by system administrator", storageClass.Provisioner) ctrl.eventRecorder.Event(claim, v1.EventTypeNormal, "ExternalProvisioning", msg)
ctrl.eventRecorder.Event(claim, v1.EventTypeNormal, "ExternalProvisioning", msg) glog.V(3).Infof("provisioning claim %q: %s", claimToClaimKey(claim), msg)
glog.V(3).Infof("provisioning claim %q: %s", claimToClaimKey(claim), msg)
} else {
glog.V(3).Infof("cannot find storage class for claim %q", claimToClaimKey(claim))
}
return return
} }