Merge pull request #92049 from Huang-Wei/postfilter-impl-3

[postfilter-impl-3] Register and enable the defaultpreemption plugin
This commit is contained in:
Kubernetes Prow Robot
2020-06-22 23:53:54 -07:00
committed by GitHub
14 changed files with 111 additions and 35 deletions

View File

@@ -601,19 +601,17 @@ func TestPostFilterPlugin(t *testing.T) {
expectPostFilterNumCalled: 0,
},
{
name: "Filter failed and PostFilter passed",
rejectFilter: true,
rejectPostFilter: false,
// TODO: change to <numNodes * 2> when the hard-coded preemption logic is removed.
expectFilterNumCalled: numNodes * 3,
name: "Filter failed and PostFilter passed",
rejectFilter: true,
rejectPostFilter: false,
expectFilterNumCalled: numNodes * 2,
expectPostFilterNumCalled: 1,
},
{
name: "Filter failed and PostFilter failed",
rejectFilter: true,
rejectPostFilter: true,
// TODO: change to <numNodes * 2> when the hard-coded preemption logic is removed.
expectFilterNumCalled: numNodes * 3,
name: "Filter failed and PostFilter failed",
rejectFilter: true,
rejectPostFilter: true,
expectFilterNumCalled: numNodes * 2,
expectPostFilterNumCalled: 1,
},
}
@@ -645,6 +643,11 @@ func TestPostFilterPlugin(t *testing.T) {
Enabled: []schedulerconfig.Plugin{
{Name: postfilterPluginName},
},
// Need to disable default in-tree PostFilter plugins, as they will
// call RunFilterPlugins and hence impact the "numFilterCalled".
Disabled: []schedulerconfig.Plugin{
{Name: "*"},
},
},
},
}