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

Merge pull request #82356 from m3ngyang/opt-podgc

Browse Source 
optimize gc_controller.gcTerminated
This commit is contained in:
Kubernetes Prow Robot 2019-09-16 09:58:38 -07:00 committed by GitHub
commit 2183a84feb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/podgc/gc_controller.go
View File

@ -21,7 +21,7 @@ import (
"sync" "sync"
"time" "time"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@ -113,8 +113,6 @@ func (gcc *PodGCController) gcTerminated(pods []*v1.Pod) {
} }
terminatedPodCount := len(terminatedPods) terminatedPodCount := len(terminatedPods)
sort.Sort(byCreationTimestamp(terminatedPods))
deleteCount := terminatedPodCount - gcc.terminatedPodThreshold deleteCount := terminatedPodCount - gcc.terminatedPodThreshold
if deleteCount > terminatedPodCount { if deleteCount > terminatedPodCount {
@ -122,8 +120,12 @@ func (gcc *PodGCController) gcTerminated(pods []*v1.Pod) {
} }
if deleteCount > 0 { if deleteCount > 0 {
klog.Infof("garbage collecting %v pods", deleteCount) klog.Infof("garbage collecting %v pods", deleteCount)
} else {
return
} }
// sort only when necessary
sort.Sort(byCreationTimestamp(terminatedPods))
var wait sync.WaitGroup var wait sync.WaitGroup
for i := 0; i < deleteCount; i++ { for i := 0; i < deleteCount; i++ {
wait.Add(1) wait.Add(1)