github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

When matching clusterEvent, we should consider the "*" additionally

Browse Source 
Signed-off-by: kerthcet <kerthcet@gmail.com>
This commit is contained in:
kerthcet 2024-02-04 14:59:26 +08:00
parent 3a4c35cc89
commit d81023db30
4 changed files with 101 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/scheduler/framework/types.go
View File

@ -144,6 +144,13 @@ func (ce ClusterEvent) IsWildCard() bool {
return ce.Resource == WildCard && ce.ActionType == All
}
// Match returns true if ClusterEvent is matched with the coming event.
// If the ce.Resource is "*", there's no requirement for the coming event' Resource.
// Contrarily, if the coming event's Resource is "*", the ce.Resource should only be "*".
func (ce ClusterEvent) Match(event ClusterEvent) bool {
return ce.IsWildCard() || (ce.Resource == WildCard || ce.Resource == event.Resource) && ce.ActionType&event.ActionType != 0
}
func UnrollWildCardResource() []ClusterEventWithHint {
return []ClusterEventWithHint{
{Event: ClusterEvent{Resource: Pod, ActionType: All}},

49
pkg/scheduler/framework/types_test.go
View File

@ -1608,3 +1608,52 @@ func TestCalculatePodResourcesWithResize(t *testing.T) {
})
}
}
func TestCloudEvent_Match(t *testing.T) {
testCases := []struct {
name string
event ClusterEvent
comingEvent ClusterEvent
wantResult bool
}{
{
name: "wildcard event matches with all kinds of coming events",
event: ClusterEvent{Resource: WildCard, ActionType: All},
comingEvent: ClusterEvent{Resource: Pod, ActionType: UpdateNodeLabel},
wantResult: true,
},
{
name: "event with resource = 'Pod' matching with coming events carries same actionType",
event: ClusterEvent{Resource: Pod, ActionType: UpdateNodeLabel | UpdateNodeTaint},
comingEvent: ClusterEvent{Resource: Pod, ActionType: UpdateNodeLabel},
wantResult: true,
},
{
name: "event with resource = '*' matching with coming events carries same actionType",
event: ClusterEvent{Resource: WildCard, ActionType: UpdateNodeLabel},
comingEvent: ClusterEvent{Resource: Pod, ActionType: UpdateNodeLabel},
wantResult: true,
},
{
name: "event with resource = '*' matching with coming events carries different actionType",
event: ClusterEvent{Resource: WildCard, ActionType: UpdateNodeLabel},
comingEvent: ClusterEvent{Resource: Pod, ActionType: UpdateNodeAllocatable},
wantResult: false,
},
{
name: "event matching with coming events carries '*' resources",
event: ClusterEvent{Resource: Pod, ActionType: UpdateNodeLabel},
comingEvent: ClusterEvent{Resource: WildCard, ActionType: UpdateNodeLabel},
wantResult: false,
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
got := tc.event.Match(tc.comingEvent)
if got != tc.wantResult {
t.Fatalf("unexpected result")
}
})
}
}

2
pkg/scheduler/internal/queue/scheduling_queue.go
View File

@ -441,7 +441,7 @@ func (p *PriorityQueue) isPodWorthRequeuing(logger klog.Logger, pInfo *framework
pod := pInfo.Pod
queueStrategy := queueSkip
for eventToMatch, hintfns := range hintMap {
if eventToMatch.Resource != event.Resource || eventToMatch.ActionType&event.ActionType == 0 {
if !eventToMatch.Match(event) {
continue
}

44
pkg/scheduler/internal/queue/scheduling_queue_test.go
View File

@ -3550,6 +3550,50 @@ func Test_isPodWorthRequeuing(t *testing.T) {
},
},
},
{
name: "If event with '*' Resource, queueing hint function for specified Resource is also executed",
podInfo: &framework.QueuedPodInfo{
UnschedulablePlugins: sets.New("fooPlugin1"),
PodInfo: mustNewPodInfo(st.MakePod().Name("pod1").Namespace("ns1").UID("1").Obj()),
},
event: framework.ClusterEvent{Resource: framework.Node, ActionType: framework.Add},
oldObj: nil,
newObj: st.MakeNode().Obj(),
expected: queueAfterBackoff,
expectedExecutionCount: 1,
queueingHintMap: QueueingHintMapPerProfile{
"": {
framework.ClusterEvent{Resource: framework.WildCard, ActionType: framework.Add}: {
{
PluginName: "fooPlugin1",
QueueingHintFn: queueHintReturnQueue,
},
},
},
},
},
{
name: "If event is a wildcard one, queueing hint function for all kinds of events is executed",
podInfo: &framework.QueuedPodInfo{
UnschedulablePlugins: sets.New("fooPlugin1"),
PodInfo: mustNewPodInfo(st.MakePod().Name("pod1").Namespace("ns1").UID("1").Obj()),
},
event: framework.ClusterEvent{Resource: framework.Node, ActionType: framework.UpdateNodeLabel | framework.UpdateNodeTaint},
oldObj: nil,
newObj: st.MakeNode().Obj(),
expected: queueAfterBackoff,
expectedExecutionCount: 1,
queueingHintMap: QueueingHintMapPerProfile{
"": {
framework.ClusterEvent{Resource: framework.WildCard, ActionType: framework.All}: {
{
PluginName: "fooPlugin1",
QueueingHintFn: queueHintReturnQueue,
},
},
},
},
},
}
for _, test := range tests {