Skip to content

Commit a34b914

Browse files
authored
Merge pull request kubernetes#89921 from fromanirh/cpumanager-checkpoint
cpumanager: drop old custom file backend
2 parents ac0ce73 + 623587e commit a34b914

File tree

5 files changed

+16
-907
lines changed

5 files changed

+16
-907
lines changed

pkg/kubelet/cm/cpumanager/state/BUILD

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ go_library(
66
"checkpoint.go",
77
"state.go",
88
"state_checkpoint.go",
9-
"state_file.go",
109
"state_mem.go",
1110
],
1211
importpath = "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state",
@@ -24,18 +23,13 @@ go_library(
2423

2524
go_test(
2625
name = "go_default_test",
27-
srcs = [
28-
"state_checkpoint_test.go",
29-
"state_compatibility_test.go",
30-
"state_file_test.go",
31-
],
26+
srcs = ["state_checkpoint_test.go"],
3227
embed = [":go_default_library"],
3328
deps = [
3429
"//pkg/kubelet/checkpointmanager:go_default_library",
3530
"//pkg/kubelet/cm/containermap:go_default_library",
3631
"//pkg/kubelet/cm/cpumanager/state/testing:go_default_library",
3732
"//pkg/kubelet/cm/cpuset:go_default_library",
38-
"//vendor/github.com/stretchr/testify/require:go_default_library",
3933
],
4034
)
4135

pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package state
1818

1919
import (
2020
"os"
21+
"reflect"
2122
"strings"
2223
"testing"
2324

@@ -397,3 +398,17 @@ func TestCheckpointStateClear(t *testing.T) {
397398
})
398399
}
399400
}
401+
402+
func AssertStateEqual(t *testing.T, sf State, sm State) {
403+
cpusetSf := sf.GetDefaultCPUSet()
404+
cpusetSm := sm.GetDefaultCPUSet()
405+
if !cpusetSf.Equals(cpusetSm) {
406+
t.Errorf("State CPUSet mismatch. Have %v, want %v", cpusetSf, cpusetSm)
407+
}
408+
409+
cpuassignmentSf := sf.GetCPUAssignments()
410+
cpuassignmentSm := sm.GetCPUAssignments()
411+
if !reflect.DeepEqual(cpuassignmentSf, cpuassignmentSm) {
412+
t.Errorf("State CPU assignments mismatch. Have %s, want %s", cpuassignmentSf, cpuassignmentSm)
413+
}
414+
}

pkg/kubelet/cm/cpumanager/state/state_compatibility_test.go

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)