github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105853 from caden2016/master

Browse Source 
restore NumPDBViolations info of nodes, when HTTPExtender ProcessPree…
This commit is contained in:
Kubernetes Prow Robot 2022-01-10 07:13:12 -08:00 committed by GitHub
commit 20a5b335c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 146 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/scheduler/extender.go
View File

@ -178,7 +178,7 @@ func (h *HTTPExtender) ProcessPreemption(
if h.nodeCacheCapable {
// If extender has cached node info, pass NodeNameToMetaVictims in args.
nodeNameToMetaVictims := convertToNodeNameToMetaVictims(nodeNameToVictims)
nodeNameToMetaVictims := convertToMetaVictims(nodeNameToVictims)
args = &extenderv1.ExtenderPreemptionArgs{
Pod: pod,
NodeNameToMetaVictims: nodeNameToMetaVictims,
@ -196,7 +196,7 @@ func (h *HTTPExtender) ProcessPreemption(
// Extender will always return NodeNameToMetaVictims.
// So let's convert it to NodeNameToVictims by using <nodeInfos>.
newNodeNameToVictims, err := h.convertToNodeNameToVictims(result.NodeNameToMetaVictims, nodeInfos)
newNodeNameToVictims, err := h.convertToVictims(result.NodeNameToMetaVictims, nodeInfos)
if err != nil {
return nil, err
}
@ -204,9 +204,9 @@ func (h *HTTPExtender) ProcessPreemption(
return newNodeNameToVictims, nil
}
// convertToNodeNameToVictims converts "nodeNameToMetaVictims" from object identifiers,
// convertToVictims converts "nodeNameToMetaVictims" from object identifiers,
// such as UIDs and names, to object pointers.
func (h *HTTPExtender) convertToNodeNameToVictims(
func (h *HTTPExtender) convertToVictims(
nodeNameToMetaVictims map[string]*extenderv1.MetaVictims,
nodeInfos framework.NodeInfoLister,
) (map[string]*extenderv1.Victims, error) {
@ -217,7 +217,8 @@ func (h *HTTPExtender) convertToNodeNameToVictims(
return nil, err
}
victims := &extenderv1.Victims{
Pods: []*v1.Pod{},
Pods: []*v1.Pod{},
NumPDBViolations: metaVictims.NumPDBViolations,
}
for _, metaPod := range metaVictims.Pods {
pod, err := h.convertPodUIDToPod(metaPod, nodeInfo)
@ -247,14 +248,15 @@ func (h *HTTPExtender) convertPodUIDToPod(
h.extenderURL, metaPod, nodeInfo.Node().Name)
}
// convertToNodeNameToMetaVictims converts from struct type to meta types.
func convertToNodeNameToMetaVictims(
// convertToMetaVictims converts from struct type to meta types.
func convertToMetaVictims(
nodeNameToVictims map[string]*extenderv1.Victims,
) map[string]*extenderv1.MetaVictims {
nodeNameToMetaVictims := map[string]*extenderv1.MetaVictims{}
for node, victims := range nodeNameToVictims {
metaVictims := &extenderv1.MetaVictims{
Pods: []*extenderv1.MetaPod{},
Pods: []*extenderv1.MetaPod{},
NumPDBViolations: victims.NumPDBViolations,
}
for _, pod := range victims.Pods {
metaPod := &extenderv1.MetaPod{

137
pkg/scheduler/extender_test.go
View File

@ -22,15 +22,17 @@ import (
"testing"
"time"
v1 "k8s.io/api/core/v1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
clientsetfake "k8s.io/client-go/kubernetes/fake"
extenderv1 "k8s.io/kube-scheduler/extender/v1"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/fake"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort"
"k8s.io/kubernetes/pkg/scheduler/framework/runtime"
@ -388,3 +390,136 @@ func TestIsInterested(t *testing.T) {
})
}
}
func TestConvertToMetaVictims(t *testing.T) {
tests := []struct {
name string
nodeNameToVictims map[string]*extenderv1.Victims
want map[string]*extenderv1.MetaVictims
}{
{
name: "test NumPDBViolations is transferred from nodeNameToVictims to nodeNameToMetaVictims",
nodeNameToVictims: map[string]*extenderv1.Victims{
"node1": {
Pods: []*v1.Pod{
{ObjectMeta: metav1.ObjectMeta{Name: "pod1", UID: "uid1"}},
{ObjectMeta: metav1.ObjectMeta{Name: "pod3", UID: "uid3"}},
},
NumPDBViolations: 1,
},
"node2": {
Pods: []*v1.Pod{
{ObjectMeta: metav1.ObjectMeta{Name: "pod2", UID: "uid2"}},
{ObjectMeta: metav1.ObjectMeta{Name: "pod4", UID: "uid4"}},
},
NumPDBViolations: 2,
},
},
want: map[string]*extenderv1.MetaVictims{
"node1": {
Pods: []*extenderv1.MetaPod{
{UID: "uid1"},
{UID: "uid3"},
},
NumPDBViolations: 1,
},
"node2": {
Pods: []*extenderv1.MetaPod{
{UID: "uid2"},
{UID: "uid4"},
},
NumPDBViolations: 2,
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := convertToMetaVictims(tt.nodeNameToVictims); !reflect.DeepEqual(got, tt.want) {
t.Errorf("convertToMetaVictims() = %v, want %v", got, tt.want)
}
})
}
}
func TestConvertToVictims(t *testing.T) {
tests := []struct {
name string
httpExtender *HTTPExtender
nodeNameToMetaVictims map[string]*extenderv1.MetaVictims
nodeNames []string
podsInNodeList []*v1.Pod
nodeInfos framework.NodeInfoLister
want map[string]*extenderv1.Victims
wantErr bool
}{
{
name: "test NumPDBViolations is transferred from NodeNameToMetaVictims to newNodeNameToVictims",
httpExtender: &HTTPExtender{},
nodeNameToMetaVictims: map[string]*extenderv1.MetaVictims{
"node1": {
Pods: []*extenderv1.MetaPod{
{UID: "uid1"},
{UID: "uid3"},
},
NumPDBViolations: 1,
},
"node2": {
Pods: []*extenderv1.MetaPod{
{UID: "uid2"},
{UID: "uid4"},
},
NumPDBViolations: 2,
},
},
nodeNames: []string{"node1", "node2"},
podsInNodeList: []*v1.Pod{
{ObjectMeta: metav1.ObjectMeta{Name: "pod1", UID: "uid1"}},
{ObjectMeta: metav1.ObjectMeta{Name: "pod2", UID: "uid2"}},
{ObjectMeta: metav1.ObjectMeta{Name: "pod3", UID: "uid3"}},
{ObjectMeta: metav1.ObjectMeta{Name: "pod4", UID: "uid4"}},
},
nodeInfos: nil,
want: map[string]*extenderv1.Victims{
"node1": {
Pods: []*v1.Pod{
{ObjectMeta: metav1.ObjectMeta{Name: "pod1", UID: "uid1"}},
{ObjectMeta: metav1.ObjectMeta{Name: "pod3", UID: "uid3"}},
},
NumPDBViolations: 1,
},
"node2": {
Pods: []*v1.Pod{
{ObjectMeta: metav1.ObjectMeta{Name: "pod2", UID: "uid2"}},
{ObjectMeta: metav1.ObjectMeta{Name: "pod4", UID: "uid4"}},
},
NumPDBViolations: 2,
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// nodeInfos instantiations
nodeInfoList := make([]*framework.NodeInfo, 0, len(tt.nodeNames))
for i, nm := range tt.nodeNames {
nodeInfo := framework.NewNodeInfo()
node := createNode(nm)
nodeInfo.SetNode(node)
nodeInfo.AddPod(tt.podsInNodeList[i])
nodeInfo.AddPod(tt.podsInNodeList[i+2])
nodeInfoList = append(nodeInfoList, nodeInfo)
}
tt.nodeInfos = fake.NodeInfoLister(nodeInfoList)
got, err := tt.httpExtender.convertToVictims(tt.nodeNameToMetaVictims, tt.nodeInfos)
if (err != nil) != tt.wantErr {
t.Errorf("convertToVictims() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("convertToVictims() got = %v, want %v", got, tt.want)
}
})
}
}