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

Merge pull request #42631 from NickrenREN/pv-isVolumeBoundToClaim-1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42522, 42545, 42556, 42006, 42631)

optimize the binding logic of bindClaimToVolume

extract var shouldSetBoundByController and do not need to judge volumename twice
**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-24 15:10:35 -07:00 committed by GitHub
commit d585eb3035
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -790,9 +790,9 @@ func (ctrl *PersistentVolumeController) bindClaimToVolume(claim *v1.PersistentVo
dirty := false dirty := false
// Check if the claim was already bound (either by controller or by user) // Check if the claim was already bound (either by controller or by user)
shouldSetBoundByController := false shouldBind := false
if volume.Name != claim.Spec.VolumeName { if volume.Name != claim.Spec.VolumeName {
shouldSetBoundByController = true shouldBind = true
} }
// The claim from method args can be pointing to watcher cache. We must not // The claim from method args can be pointing to watcher cache. We must not
@ -806,16 +806,15 @@ func (ctrl *PersistentVolumeController) bindClaimToVolume(claim *v1.PersistentVo
return nil, fmt.Errorf("Unexpected claim cast error : %v", claimClone) return nil, fmt.Errorf("Unexpected claim cast error : %v", claimClone)
} }
// Bind the claim to the volume if it is not bound yet if shouldBind {
if claimClone.Spec.VolumeName != volume.Name { dirty = true
// Bind the claim to the volume
claimClone.Spec.VolumeName = volume.Name claimClone.Spec.VolumeName = volume.Name
dirty = true
}
// Set annBoundByController if it is not set yet // Set annBoundByController if it is not set yet
if shouldSetBoundByController && !metav1.HasAnnotation(claimClone.ObjectMeta, annBoundByController) { if !metav1.HasAnnotation(claimClone.ObjectMeta, annBoundByController) {
metav1.SetMetaDataAnnotation(&claimClone.ObjectMeta, annBoundByController, "yes") metav1.SetMetaDataAnnotation(&claimClone.ObjectMeta, annBoundByController, "yes")
dirty = true }
} }
// Set annBindCompleted if it is not set yet // Set annBindCompleted if it is not set yet