kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use the same error for node not found in basic & delta snapshots

This commit is contained in:
Aleksandra Malinowska 2020-02-06 12:42:21 +01:00
parent ad888ce87d
commit 8ad81ef4ae
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster-autoscaler/simulator/basic_cluster_snapshot.go
View File

@ -59,7 +59,7 @@ func (data *internalBasicSnapshotData) getNodeInfo(nodeName string) (*schedulern
if v, ok := data.nodeInfoMap[nodeName]; ok { if v, ok := data.nodeInfoMap[nodeName]; ok {
return v, nil return v, nil
} }
return nil, fmt.Errorf("node %s not in snapshot", nodeName) return nil, errNodeNotFound
} }
func (data *internalBasicSnapshotData) listPods(selector labels.Selector) ([]*apiv1.Pod, error) { func (data *internalBasicSnapshotData) listPods(selector labels.Selector) ([]*apiv1.Pod, error) {
@ -119,7 +119,7 @@ func (data *internalBasicSnapshotData) addNodes(nodes []*apiv1.Node) error {
func (data *internalBasicSnapshotData) removeNode(nodeName string) error { func (data *internalBasicSnapshotData) removeNode(nodeName string) error {
if _, found := data.nodeInfoMap[nodeName]; !found { if _, found := data.nodeInfoMap[nodeName]; !found {
return fmt.Errorf("node %s not in snapshot", nodeName) return errNodeNotFound
} }
delete(data.nodeInfoMap, nodeName) delete(data.nodeInfoMap, nodeName)
return nil return nil
@ -127,7 +127,7 @@ func (data *internalBasicSnapshotData) removeNode(nodeName string) error {
func (data *internalBasicSnapshotData) addPod(pod *apiv1.Pod, nodeName string) error { func (data *internalBasicSnapshotData) addPod(pod *apiv1.Pod, nodeName string) error {
if _, found := data.nodeInfoMap[nodeName]; !found { if _, found := data.nodeInfoMap[nodeName]; !found {
return fmt.Errorf("node %s not in snapshot", nodeName) return errNodeNotFound
} }
data.nodeInfoMap[nodeName].AddPod(pod) data.nodeInfoMap[nodeName].AddPod(pod)
return nil return nil
@ -136,7 +136,7 @@ func (data *internalBasicSnapshotData) addPod(pod *apiv1.Pod, nodeName string) e
func (data *internalBasicSnapshotData) removePod(namespace, podName, nodeName string) error { func (data *internalBasicSnapshotData) removePod(namespace, podName, nodeName string) error {
nodeInfo, found := data.nodeInfoMap[nodeName] nodeInfo, found := data.nodeInfoMap[nodeName]
if !found { if !found {
return fmt.Errorf("node not found") return errNodeNotFound
} }
for _, pod := range nodeInfo.Pods() { for _, pod := range nodeInfo.Pods() {
if pod.Namespace == namespace && pod.Name == podName { if pod.Namespace == namespace && pod.Name == podName {

4
cluster-autoscaler/simulator/cluster_snapshot.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package simulator package simulator
import ( import (
"errors"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
schedulerlisters "k8s.io/kubernetes/pkg/scheduler/listers" schedulerlisters "k8s.io/kubernetes/pkg/scheduler/listers"
) )
@ -48,3 +50,5 @@ type ClusterSnapshot interface {
// Clear reset cluster snapshot to empty, unforked state // Clear reset cluster snapshot to empty, unforked state
Clear() Clear()
} }
var errNodeNotFound = errors.New("node not found")

3
cluster-autoscaler/simulator/delta_cluster_snapshot.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package simulator package simulator
import ( import (
"errors"
"fmt" "fmt"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
@ -61,8 +60,6 @@ type internalDeltaSnapshotData struct {
havePodsWithAffinity []*schedulernodeinfo.NodeInfo havePodsWithAffinity []*schedulernodeinfo.NodeInfo
} }
var errNodeNotFound = errors.New("node not found")
func newInternalDeltaSnapshotData() *internalDeltaSnapshotData { func newInternalDeltaSnapshotData() *internalDeltaSnapshotData {
return &internalDeltaSnapshotData{ return &internalDeltaSnapshotData{
addedNodeInfoMap: make(map[string]*schedulernodeinfo.NodeInfo), addedNodeInfoMap: make(map[string]*schedulernodeinfo.NodeInfo),