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

Merge pull request #79736 from ricky1993/fix_eviction_conflict

Browse Source 
Get the pdb of current version when conflict instead of relisting
This commit is contained in:
Kubernetes Prow Robot 2019-07-04 06:56:39 -07:00 committed by GitHub
commit 7bbc130f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/registry/core/pod/storage/eviction.go
View File

@ -133,7 +133,7 @@ func (r *EvictionREST) Create(ctx context.Context, obj runtime.Object, createVal
} }
var rtStatus *metav1.Status var rtStatus *metav1.Status
var pdbName string var pdbName string
err = retry.RetryOnConflict(EvictionsRetry, func() error { err = func() error {
pdbs, err := r.getPodDisruptionBudgets(ctx, pod) pdbs, err := r.getPodDisruptionBudgets(ctx, pod)
if err != nil { if err != nil {
return err return err
@ -146,19 +146,33 @@ func (r *EvictionREST) Create(ctx context.Context, obj runtime.Object, createVal
Code: 500, Code: 500,
} }
return nil return nil
} else if len(pdbs) == 1 { }
pdb := pdbs[0] if len(pdbs) == 0 {
pdbName = pdb.Name return nil
}
pdb := &pdbs[0]
pdbName = pdb.Name
refresh := false
err = retry.RetryOnConflict(EvictionsRetry, func() error {
if refresh {
pdb, err = r.podDisruptionBudgetClient.PodDisruptionBudgets(pod.Namespace).Get(pdbName, metav1.GetOptions{})
if err != nil {
return err
}
}
// Try to verify-and-decrement // Try to verify-and-decrement
// If it was false already, or if it becomes false during the course of our retries, // If it was false already, or if it becomes false during the course of our retries,
// raise an error marked as a 429. // raise an error marked as a 429.
if err := r.checkAndDecrement(pod.Namespace, pod.Name, pdb, dryrun.IsDryRun(deletionOptions.DryRun)); err != nil { if err = r.checkAndDecrement(pod.Namespace, pod.Name, *pdb, dryrun.IsDryRun(deletionOptions.DryRun)); err != nil {
refresh = true
return err return err
} }
} return nil
return nil })
}) return err
}()
if err == wait.ErrWaitTimeout { if err == wait.ErrWaitTimeout {
err = errors.NewTimeoutError(fmt.Sprintf("couldn't update PodDisruptionBudget %q due to conflicts", pdbName), 10) err = errors.NewTimeoutError(fmt.Sprintf("couldn't update PodDisruptionBudget %q due to conflicts", pdbName), 10)
} }