This is an automated email from the ASF dual-hosted git repository.
wilfreds pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-core.git
The following commit(s) were added to refs/heads/master by this push:
new 192f2a3f [YUNIKORN-3208] Added test for quota.preemption.delay
inheritance (#1069)
192f2a3f is described below
commit 192f2a3f4821b628110671b58533a0199a6a3a4a
Author: mani <[email protected]>
AuthorDate: Tue Mar 17 19:30:38 2026 +1100
[YUNIKORN-3208] Added test for quota.preemption.delay inheritance (#1069)
Renamed QuotaPreemptionDelay queue property name to align with
documentation.
Closes: #1069
Signed-off-by: Wilfred Spiegelenburg <[email protected]>
---
pkg/common/configs/configvalidator.go | 2 +-
pkg/scheduler/objects/queue_test.go | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/pkg/common/configs/configvalidator.go
b/pkg/common/configs/configvalidator.go
index e78593ac..3117368f 100644
--- a/pkg/common/configs/configvalidator.go
+++ b/pkg/common/configs/configvalidator.go
@@ -50,7 +50,7 @@ const (
PriorityOffset = "priority.offset"
PreemptionPolicy = "preemption.policy"
PreemptionDelay = "preemption.delay"
- QuotaPreemptionDelay = "preemption.quota.delay"
+ QuotaPreemptionDelay = "quota.preemption.delay"
// app sort priority values
ApplicationSortPriorityEnabled = "enabled"
diff --git a/pkg/scheduler/objects/queue_test.go
b/pkg/scheduler/objects/queue_test.go
index dd1c1815..7e48c500 100644
--- a/pkg/scheduler/objects/queue_test.go
+++ b/pkg/scheduler/objects/queue_test.go
@@ -1644,10 +1644,11 @@ func TestInheritedQueueProps(t *testing.T) {
assert.NilError(t, err, "failed to create basic root queue")
var parent *Queue
props := map[string]string{
- "key": "value",
- "priority.policy": "fence",
- "priority.offset": "100",
- "preemption.policy": "fence",
+ "key": "value",
+ "priority.policy": "fence",
+ "priority.offset": "100",
+ "preemption.policy": "fence",
+ configs.QuotaPreemptionDelay: "15s",
}
parent, err = createManagedQueueWithProps(root, "parent", true, nil,
props)
assert.NilError(t, err, "failed to create parent queue")
@@ -1658,6 +1659,7 @@ func TestInheritedQueueProps(t *testing.T) {
assert.Equal(t, parent.priorityPolicy, policies.FencePriorityPolicy)
assert.Equal(t, parent.priorityOffset, int32(100))
assert.Equal(t, parent.preemptionPolicy, policies.FencePreemptionPolicy)
+ assert.Equal(t, parent.quotaPreemptionDelay,
time.Duration(15)*time.Second)
var leaf *Queue
leaf, err = createManagedQueue(parent, "leaf", false, nil)
@@ -1668,18 +1670,26 @@ func TestInheritedQueueProps(t *testing.T) {
assert.Equal(t, leaf.priorityPolicy, policies.DefaultPriorityPolicy)
assert.Equal(t, leaf.priorityOffset, int32(0))
assert.Equal(t, leaf.preemptionPolicy, policies.DefaultPreemptionPolicy)
+ assert.Equal(t, leaf.quotaPreemptionDelay,
time.Duration(15)*time.Second)
props = map[string]string{
- "preemption.policy": "disabled",
+ "preemption.policy": "disabled",
+ configs.QuotaPreemptionDelay: "20s",
}
parent, err = createManagedQueueWithProps(root, "parent", true, nil,
props)
assert.NilError(t, err, "failed to create parent queue")
assert.Equal(t, parent.preemptionPolicy,
policies.DisabledPreemptionPolicy)
+ assert.Equal(t, parent.quotaPreemptionDelay,
time.Duration(20)*time.Second)
- leaf, err = createManagedQueue(parent, "leaf", false, nil)
+ props = map[string]string{
+ configs.QuotaPreemptionDelay: "10s",
+ }
+
+ leaf, err = createManagedQueueWithProps(parent, "leaf", false, nil,
props)
assert.NilError(t, err, "failed to create leaf queue")
assert.Equal(t, leaf.preemptionPolicy,
policies.DisabledPreemptionPolicy)
+ assert.Equal(t, leaf.quotaPreemptionDelay,
time.Duration(10)*time.Second)
}
func TestMaxResource(t *testing.T) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
