From 278717bc577ed6340949ea870d2e3acc23de84aa Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 14 Oct 2019 16:21:26 +0200 Subject: [PATCH] Fix ineffectual assignment to CPUSets Signed-off-by: Sascha Grunert --- pkg/kubelet/cm/cpumanager/state/state_checkpoint.go | 8 +++----- pkg/kubelet/cm/cpumanager/state/state_file.go | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkg/kubelet/cm/cpumanager/state/state_checkpoint.go b/pkg/kubelet/cm/cpumanager/state/state_checkpoint.go index cd8bd994a69..ce1555cb096 100644 --- a/pkg/kubelet/cm/cpumanager/state/state_checkpoint.go +++ b/pkg/kubelet/cm/cpumanager/state/state_checkpoint.go @@ -93,11 +93,6 @@ func (sc *stateCheckpoint) restoreState() error { defer sc.mux.Unlock() var err error - // used when all parsing is ok - tmpAssignments := make(ContainerCPUAssignments) - tmpDefaultCPUSet := cpuset.NewCPUSet() - tmpContainerCPUSet := cpuset.NewCPUSet() - checkpointV1 := newCPUManagerCheckpointV1() checkpointV2 := newCPUManagerCheckpointV2() @@ -120,10 +115,13 @@ func (sc *stateCheckpoint) restoreState() error { return fmt.Errorf("configured policy %q differs from state checkpoint policy %q", sc.policyName, checkpointV2.PolicyName) } + var tmpDefaultCPUSet cpuset.CPUSet if tmpDefaultCPUSet, err = cpuset.Parse(checkpointV2.DefaultCPUSet); err != nil { return fmt.Errorf("could not parse default cpu set %q: %v", checkpointV2.DefaultCPUSet, err) } + var tmpContainerCPUSet cpuset.CPUSet + tmpAssignments := ContainerCPUAssignments{} for pod := range checkpointV2.Entries { tmpAssignments[pod] = make(map[string]cpuset.CPUSet) for container, cpuString := range checkpointV2.Entries[pod] { diff --git a/pkg/kubelet/cm/cpumanager/state/state_file.go b/pkg/kubelet/cm/cpumanager/state/state_file.go index f3b8e70470d..6b36f76734f 100644 --- a/pkg/kubelet/cm/cpumanager/state/state_file.go +++ b/pkg/kubelet/cm/cpumanager/state/state_file.go @@ -100,12 +100,6 @@ func (sf *stateFile) tryRestoreState() error { sf.Lock() defer sf.Unlock() var err error - - // used when all parsing is ok - tmpAssignments := make(ContainerCPUAssignments) - tmpDefaultCPUSet := cpuset.NewCPUSet() - tmpContainerCPUSet := cpuset.NewCPUSet() - var content []byte content, err = ioutil.ReadFile(sf.stateFilePath) @@ -143,11 +137,14 @@ func (sf *stateFile) tryRestoreState() error { return fmt.Errorf("policy configured \"%s\" != policy from state file \"%s\"", sf.policyName, readStateV2.PolicyName) } + var tmpDefaultCPUSet cpuset.CPUSet if tmpDefaultCPUSet, err = cpuset.Parse(readStateV2.DefaultCPUSet); err != nil { klog.Errorf("[cpumanager] state file: could not parse state file - [defaultCpuSet:\"%s\"]", readStateV2.DefaultCPUSet) return err } + var tmpContainerCPUSet cpuset.CPUSet + tmpAssignments := ContainerCPUAssignments{} for pod := range readStateV2.Entries { tmpAssignments[pod] = make(map[string]cpuset.CPUSet) for container, cpuString := range readStateV2.Entries[pod] {