Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use rate limiting queue with delaying for pod deletion events #2774

Merged
merged 1 commit into from
May 9, 2023
Merged

use rate limiting queue with delaying for pod deletion events #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,13 @@ func Run(ctx context.Context, config *Configuration) {
providerNetworksLister: providerNetworkInformer.Lister(),
providerNetworkSynced: providerNetworkInformer.Informer().HasSynced,

podsLister: podInformer.Lister(),
podsSynced: podInformer.Informer().HasSynced,
addOrUpdatePodQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "AddOrUpdatePod"),
deletePodQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "DeletePod"),
podsLister: podInformer.Lister(),
podsSynced: podInformer.Informer().HasSynced,
addOrUpdatePodQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "AddOrUpdatePod"),
deletePodQueue: workqueue.NewRateLimitingQueueWithDelayingInterface(
workqueue.NewNamedDelayingQueue("DeletePod"),
workqueue.DefaultControllerRateLimiter(),
),
updatePodSecurityQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "UpdatePodSecurity"),
podKeyMutex: keymutex.New(97),

Expand Down
24 changes: 16 additions & 8 deletions pkg/controller/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,30 +289,38 @@ func (c *Controller) enqueueUpdatePod(oldObj, newObj interface{}) {
return
}

// enqueue delay
var delay time.Duration
if newPod.Spec.TerminationGracePeriodSeconds != nil {
if newPod.DeletionTimestamp != nil {
delay = time.Until(newPod.DeletionTimestamp.Add(time.Duration(*newPod.Spec.TerminationGracePeriodSeconds) * time.Second))
} else {
delay = time.Duration(*newPod.Spec.TerminationGracePeriodSeconds) * time.Second
}
}

if newPod.DeletionTimestamp != nil && !isStateful && !isVmPod {
go func() {
// In case node get lost and pod can not be deleted,
// the ip address will not be recycled
time.Sleep(time.Duration(*newPod.Spec.TerminationGracePeriodSeconds) * time.Second)
c.deletePodQueue.Add(newObj)
klog.V(3).Infof("enqueue delete pod %s after %v", key, delay)
c.deletePodQueue.AddAfter(newObj, delay)
}()
return
}

// do not delete statefulset pod unless ownerReferences is deleted
if isStateful && isStatefulSetPodToDel(c.config.KubeClient, newPod, statefulSetName) {
go func() {
klog.V(3).Infof("enqueue delete pod %s", key)
time.Sleep(time.Duration(*newPod.Spec.TerminationGracePeriodSeconds) * time.Second)
c.deletePodQueue.Add(newObj)
klog.V(3).Infof("enqueue delete pod %s after %v", key, delay)
c.deletePodQueue.AddAfter(newObj, delay)
}()
return
}
if isVmPod && c.isVmPodToDel(newPod, vmName) {
go func() {
klog.V(3).Infof("enqueue delete pod %s", key)
time.Sleep(time.Duration(*newPod.Spec.TerminationGracePeriodSeconds) * time.Second)
c.deletePodQueue.Add(newObj)
klog.V(3).Infof("enqueue delete pod %s after %v", key, delay)
c.deletePodQueue.AddAfter(newObj, delay)
}()
return
}
Expand Down