Skip to content

Commit

Permalink
Update unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
@wzshiming
wzshiming authored and Skyler Clark committed Jul 15, 2021
1 parent 7f360b7 commit b1cbca5
Show file tree
Hide file tree
Showing 3 changed files with 246 additions and 16 deletions.
2 changes: 2 additions & 0 deletions pkg/kubelet/apis/config/helpers_test.go
View file
Expand Up @@ -216,6 +216,8 @@ var (
"OOMScoreAdj",
"PodCIDR",
"PodPidsLimit",
"PodPriorityShutdownGracePeriods[*].Priority",
"PodPriorityShutdownGracePeriods[*].ShutdownGracePeriodSeconds",
"PodsPerCore",
"Port",
"ProtectKernelDefaults",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/kubelet_test.go
View file
Expand Up @@ -314,7 +314,7 @@ func newTestKubeletWithImageList(
kubelet.admitHandlers.AddPodAdmitHandler(evictionAdmitHandler)

// setup shutdown manager
shutdownManager, shutdownAdmitHandler := nodeshutdown.NewManager(kubelet.podManager.GetPods, killPodNow(kubelet.podWorkers, fakeRecorder), func() {}, 0 /* shutdownGracePeriodRequested*/, 0 /*shutdownGracePeriodCriticalPods */, kubelet.probeManager)
shutdownManager, shutdownAdmitHandler := nodeshutdown.NewManager(kubelet.podManager.GetPods, killPodNow(kubelet.podWorkers, fakeRecorder), func() {}, 0 /* shutdownGracePeriodRequested*/, 0 /*shutdownGracePeriodCriticalPods */, nil)
kubelet.shutdownManager = shutdownManager
kubelet.admitHandlers.AddPodAdmitHandler(shutdownAdmitHandler)

Expand Down
258 changes: 243 additions & 15 deletions pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux_test.go
View file
Expand Up @@ -20,6 +20,7 @@ package nodeshutdown

import (
"fmt"
"reflect"
"strings"
"testing"
"time"
Expand All @@ -33,6 +34,7 @@ import (
featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/kubernetes/pkg/apis/scheduling"
pkgfeatures "k8s.io/kubernetes/pkg/features"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/nodeshutdown/systemd"
probetest "k8s.io/kubernetes/pkg/kubelet/prober/testing"
)
Expand Down Expand Up @@ -75,12 +77,7 @@ func (f *fakeDbus) OverrideInhibitDelay(inhibitDelayMax time.Duration) error {
return nil
}

func makePod(name string, criticalPod bool, terminationGracePeriod *int64) *v1.Pod {
var priority int32
if criticalPod {
priority = scheduling.SystemCriticalPriority
}

func makePod(name string, priority int32, terminationGracePeriod *int64) *v1.Pod {
return &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Expand All @@ -94,15 +91,19 @@ func makePod(name string, criticalPod bool, terminationGracePeriod *int64) *v1.P
}

func TestManager(t *testing.T) {
normalPodNoGracePeriod := makePod("normal-pod-nil-grace-period", false /* criticalPod */, nil /* terminationGracePeriod */)
criticalPodNoGracePeriod := makePod("critical-pod-nil-grace-period", true /* criticalPod */, nil /* terminationGracePeriod */)
systemDbusTmp := systemDbus
defer func() {
systemDbus = systemDbusTmp
}()
normalPodNoGracePeriod := makePod("normal-pod-nil-grace-period", scheduling.DefaultPriorityWhenNoDefaultClassExists, nil /* terminationGracePeriod */)
criticalPodNoGracePeriod := makePod("critical-pod-nil-grace-period", scheduling.SystemCriticalPriority, nil /* terminationGracePeriod */)

shortGracePeriod := int64(2)
normalPodGracePeriod := makePod("normal-pod-grace-period", false /* criticalPod */, &shortGracePeriod /* terminationGracePeriod */)
criticalPodGracePeriod := makePod("critical-pod-grace-period", true /* criticalPod */, &shortGracePeriod /* terminationGracePeriod */)
normalPodGracePeriod := makePod("normal-pod-grace-period", scheduling.DefaultPriorityWhenNoDefaultClassExists, &shortGracePeriod /* terminationGracePeriod */)
criticalPodGracePeriod := makePod("critical-pod-grace-period", scheduling.SystemCriticalPriority, &shortGracePeriod /* terminationGracePeriod */)

longGracePeriod := int64(1000)
normalPodLongGracePeriod := makePod("normal-pod-long-grace-period", false /* criticalPod */, &longGracePeriod /* terminationGracePeriod */)
normalPodLongGracePeriod := makePod("normal-pod-long-grace-period", scheduling.DefaultPriorityWhenNoDefaultClassExists, &longGracePeriod /* terminationGracePeriod */)

var tests = []struct {
desc string
Expand Down Expand Up @@ -225,12 +226,14 @@ func TestManager(t *testing.T) {
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.GracefulNodeShutdown, true)()

manager, _ := NewManager(activePodsFunc, killPodsFunc, func() {}, tc.shutdownGracePeriodRequested, tc.shutdownGracePeriodCriticalPods, probetest.FakeManager{})
manager, _ := NewManager(activePodsFunc, killPodsFunc, func() {}, tc.shutdownGracePeriodRequested, tc.shutdownGracePeriodCriticalPods, nil)
manager.clock = clock.NewFakeClock(time.Now())

err := manager.Start()
if tc.expectedError != nil {
if !strings.Contains(err.Error(), tc.expectedError.Error()) {
if err == nil {
t.Errorf("unexpected error message. Got: <nil> want %s", tc.expectedError.Error())
} else if !strings.Contains(err.Error(), tc.expectedError.Error()) {
t.Errorf("unexpected error message. Got: %s want %s", err.Error(), tc.expectedError.Error())
}
} else {
Expand All @@ -240,7 +243,11 @@ func TestManager(t *testing.T) {
assert.Equal(t, manager.Admit(nil).Admit, true)

// Send fake shutdown event
fakeShutdownChan <- true
select {
case fakeShutdownChan <- true:
case <-time.After(1 * time.Second):
t.Fatal()
}

// Wait for all the pods to be killed
killedPodsToGracePeriods := map[string]int64{}
Expand Down Expand Up @@ -299,10 +306,231 @@ func TestFeatureEnabled(t *testing.T) {
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.GracefulNodeShutdown, tc.featureGateEnabled)()

manager, _ := NewManager(activePodsFunc, killPodsFunc, func() {}, tc.shutdownGracePeriodRequested, 0 /*shutdownGracePeriodCriticalPods*/, probetest.FakeManager{})
manager, _ := NewManager(activePodsFunc, killPodsFunc, func() {}, tc.shutdownGracePeriodRequested, 0 /*shutdownGracePeriodCriticalPods*/, nil)
manager.clock = clock.NewFakeClock(time.Now())

assert.Equal(t, tc.expectEnabled, manager.isFeatureEnabled())
})
}
}
func TestRestart(t *testing.T) {
systemDbusTmp := systemDbus
defer func() {
systemDbus = systemDbusTmp
}()

shutdownGracePeriodRequested := 30 * time.Second
shutdownGracePeriodCriticalPods := 10 * time.Second
systemInhibitDelay := 40 * time.Second
overrideSystemInhibitDelay := 40 * time.Second
activePodsFunc := func() []*v1.Pod {
return nil
}
killPodsFunc := func(pod *v1.Pod, status v1.PodStatus, gracePeriodOverride *int64) error {
return nil
}
syncNodeStatus := func() {}

var shutdownChan chan bool
var connChan = make(chan struct{}, 1)

systemDbus = func() (dbusInhibiter, error) {
defer func() {
connChan <- struct{}{}
}()

shutdownChan = make(chan bool)
dbus := &fakeDbus{currentInhibitDelay: systemInhibitDelay, shutdownChan: shutdownChan, overrideSystemInhibitDelay: overrideSystemInhibitDelay}
return dbus, nil
}

manager, _ := NewManager(activePodsFunc, killPodsFunc, syncNodeStatus, shutdownGracePeriodRequested, shutdownGracePeriodCriticalPods, nil)
err := manager.Start()
if err != nil {
t.Errorf("unexpected error: %v", err)
}

for i := 0; i != 5; i++ {
select {
case <-time.After(dbusReconnectPeriod * 5):
t.Fatal("wait dbus connect timeout")
case <-connChan:
}

time.Sleep(time.Second)
close(shutdownChan)
}
}

func Test_migrateConfig(t *testing.T) {
type args struct {
shutdownGracePeriodRequested time.Duration
shutdownGracePeriodCriticalPods time.Duration
}
tests := []struct {
name string
args args
want []kubeletconfig.PodPriorityShutdownGracePeriod
}{
{
args: args{
shutdownGracePeriodRequested: 300 * time.Second,
shutdownGracePeriodCriticalPods: 120 * time.Second,
},
want: []kubeletconfig.PodPriorityShutdownGracePeriod{
{
Priority: scheduling.DefaultPriorityWhenNoDefaultClassExists,
ShutdownGracePeriodSeconds: 180,
},
{
Priority: scheduling.SystemCriticalPriority,
ShutdownGracePeriodSeconds: 120,
},
},
},
{
args: args{
shutdownGracePeriodRequested: 100 * time.Second,
shutdownGracePeriodCriticalPods: 0 * time.Second,
},
want: []kubeletconfig.PodPriorityShutdownGracePeriod{
{
Priority: scheduling.DefaultPriorityWhenNoDefaultClassExists,
ShutdownGracePeriodSeconds: 100,
},
{
Priority: scheduling.SystemCriticalPriority,
ShutdownGracePeriodSeconds: 0,
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := migrateConfig(tt.args.shutdownGracePeriodRequested, tt.args.shutdownGracePeriodCriticalPods); !reflect.DeepEqual(got, tt.want) {
t.Errorf("migrateConfig() = %v, want %v", got, tt.want)
}
})
}
}

func Test_groupByPriority(t *testing.T) {
type args struct {
podPriorityShutdownGracePeriod []kubeletconfig.PodPriorityShutdownGracePeriod
pods []*v1.Pod
}
tests := []struct {
name string
args args
want []processShutdownGroup
}{
{
args: args{
podPriorityShutdownGracePeriod: migrateConfig(300*time.Second, 120*time.Second),
pods: []*v1.Pod{
makePod("normal-pod", scheduling.DefaultPriorityWhenNoDefaultClassExists, nil),
makePod("highest-user-definable-pod", scheduling.HighestUserDefinablePriority, nil),
makePod("critical-pod", scheduling.SystemCriticalPriority, nil),
},
},
want: []processShutdownGroup{
{
PodPriorityShutdownGracePeriod: kubeletconfig.PodPriorityShutdownGracePeriod{
Priority: scheduling.DefaultPriorityWhenNoDefaultClassExists,
ShutdownGracePeriodSeconds: 180,
},
Pods: []*v1.Pod{
makePod("normal-pod", scheduling.DefaultPriorityWhenNoDefaultClassExists, nil),
makePod("highest-user-definable-pod", scheduling.HighestUserDefinablePriority, nil),
},
},
{
PodPriorityShutdownGracePeriod: kubeletconfig.PodPriorityShutdownGracePeriod{
Priority: scheduling.SystemCriticalPriority,
ShutdownGracePeriodSeconds: 120,
},
Pods: []*v1.Pod{
makePod("critical-pod", scheduling.SystemCriticalPriority, nil),
},
},
},
},
{
args: args{
podPriorityShutdownGracePeriod: []kubeletconfig.PodPriorityShutdownGracePeriod{
{
Priority: 1,
ShutdownGracePeriodSeconds: 10,
},
{
Priority: 2,
ShutdownGracePeriodSeconds: 20,
},
{
Priority: 3,
ShutdownGracePeriodSeconds: 30,
},
{
Priority: 4,
ShutdownGracePeriodSeconds: 40,
},
},
pods: []*v1.Pod{
makePod("pod-0", 0, nil),
makePod("pod-1", 1, nil),
makePod("pod-2", 2, nil),
makePod("pod-3", 3, nil),
makePod("pod-4", 4, nil),
makePod("pod-5", 5, nil),
},
},
want: []processShutdownGroup{
{
PodPriorityShutdownGracePeriod: kubeletconfig.PodPriorityShutdownGracePeriod{
Priority: 1,
ShutdownGracePeriodSeconds: 10,
},
Pods: []*v1.Pod{
makePod("pod-0", 0, nil),
makePod("pod-1", 1, nil),
},
},
{
PodPriorityShutdownGracePeriod: kubeletconfig.PodPriorityShutdownGracePeriod{
Priority: 2,
ShutdownGracePeriodSeconds: 20,
},
Pods: []*v1.Pod{
makePod("pod-2", 2, nil),
},
},
{
PodPriorityShutdownGracePeriod: kubeletconfig.PodPriorityShutdownGracePeriod{
Priority: 3,
ShutdownGracePeriodSeconds: 30,
},
Pods: []*v1.Pod{
makePod("pod-3", 3, nil),
},
},
{
PodPriorityShutdownGracePeriod: kubeletconfig.PodPriorityShutdownGracePeriod{
Priority: 4,
ShutdownGracePeriodSeconds: 40,
},
Pods: []*v1.Pod{
makePod("pod-4", 4, nil),
makePod("pod-5", 5, nil),
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := groupByPriority(tt.args.podPriorityShutdownGracePeriod, tt.args.pods); !reflect.DeepEqual(got, tt.want) {
t.Errorf("groupByPriority() = %v, want %v", got, tt.want)
}
})
}
}

0 comments on commit b1cbca5

Please sign in to comment.