mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Merge pull request #67062 from cofyc/fix66287
Automatic merge from submit-queue (batch tested with PRs 67062, 67169, 67539, 67504, 66876). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Double check PVC if not found in syncVolume **What this PR does / why we need it**: Double check PVC if not found in syncVolume. If PV is bound by external PV binder (e.g. kube-scheduler), it's possible on heavy load that corresponding PVC is not synced to controller local cache yet. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #66287 **Special notes for your reviewer**: **Release note**: ```release-note Double check PVC if not found in syncVolume to prevent reclaiming PV wrongly. ```
This commit is contained in:
commit
027d0fcfdf
@ -123,6 +123,8 @@ const annBindCompleted = "pv.kubernetes.io/bind-completed"
|
||||
// the binding (PV->PVC or PVC->PV) was installed by the controller. The
|
||||
// absence of this annotation means the binding was done by the user (i.e.
|
||||
// pre-bound). Value of this annotation does not matter.
|
||||
// External PV binders must bind PV the same way as PV controller, otherwise PV
|
||||
// controller may not handle it correctly.
|
||||
const annBoundByController = "pv.kubernetes.io/bound-by-controller"
|
||||
|
||||
// This annotation is added to a PV that has been dynamically provisioned by
|
||||
@ -545,6 +547,30 @@ func (ctrl *PersistentVolumeController) syncVolume(volume *v1.PersistentVolume)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !found && metav1.HasAnnotation(volume.ObjectMeta, annBoundByController) {
|
||||
// If PV is bound by external PV binder (e.g. kube-scheduler), it's
|
||||
// possible on heavy load that corresponding PVC is not synced to
|
||||
// controller local cache yet. So we need to double-check PVC in
|
||||
// 1) informer cache
|
||||
// 2) apiserver if not found in informer cache
|
||||
// to make sure we will not reclaim a PV wrongly.
|
||||
// Note that only non-released and non-failed volumes will be
|
||||
// updated to Released state when PVC does not eixst.
|
||||
if volume.Status.Phase != v1.VolumeReleased && volume.Status.Phase != v1.VolumeFailed {
|
||||
obj, err = ctrl.claimLister.PersistentVolumeClaims(volume.Spec.ClaimRef.Namespace).Get(volume.Spec.ClaimRef.Name)
|
||||
if err != nil && !apierrs.IsNotFound(err) {
|
||||
return err
|
||||
}
|
||||
found = !apierrs.IsNotFound(err)
|
||||
if !found {
|
||||
obj, err = ctrl.kubeClient.CoreV1().PersistentVolumeClaims(volume.Spec.ClaimRef.Namespace).Get(volume.Spec.ClaimRef.Name, metav1.GetOptions{})
|
||||
if err != nil && !apierrs.IsNotFound(err) {
|
||||
return err
|
||||
}
|
||||
found = !apierrs.IsNotFound(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
glog.V(4).Infof("synchronizing PersistentVolume[%s]: claim %s not found", volume.Name, claimrefToClaimKey(volume.Spec.ClaimRef))
|
||||
// Fall through with claim = nil
|
||||
|
Loading…
Reference in New Issue
Block a user