This is an automated email from the ASF dual-hosted git repository.
ccondit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-k8shim.git
The following commit(s) were added to refs/heads/master by this push:
new 412d337f [YUNIKORN-2948] Add MockScheduler test which verifies foreign
pod tracking (#933)
412d337f is described below
commit 412d337f9ecaf87ca28b0362f31638379d3ae06b
Author: Peter Bacsko <[email protected]>
AuthorDate: Mon Oct 28 16:11:24 2024 -0500
[YUNIKORN-2948] Add MockScheduler test which verifies foreign pod tracking
(#933)
Closes: #933
Signed-off-by: Craig Condit <[email protected]>
---
pkg/shim/scheduler_mock_test.go | 18 ++++++++++++++
pkg/shim/scheduler_test.go | 54 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/pkg/shim/scheduler_mock_test.go b/pkg/shim/scheduler_mock_test.go
index 7b8de855..a220ff26 100644
--- a/pkg/shim/scheduler_mock_test.go
+++ b/pkg/shim/scheduler_mock_test.go
@@ -318,6 +318,24 @@ func (fc *MockScheduler)
waitForApplicationStateInCore(appID, partition, expecte
}, time.Second, 5*time.Second)
}
+func (fc *MockScheduler) waitAndAssertForeignAllocationInCore(partition,
allocationID, nodeID string, shouldExist bool) error {
+ return utils.WaitForCondition(func() bool {
+ node :=
fc.coreContext.Scheduler.GetClusterContext().GetNode(nodeID, partition)
+ if node == nil {
+ log.Log(log.Test).Warn("Node not found",
zap.String("node ID", nodeID))
+ return false
+ }
+ allocs := node.GetForeignAllocations()
+ for _, alloc := range allocs {
+ if alloc.GetAllocationKey() == allocationID {
+ return shouldExist
+ }
+ }
+
+ return !shouldExist
+ }, time.Second, 5*time.Second)
+}
+
func (fc *MockScheduler) getApplicationFromCore(appID, partition string)
*objects.Application {
return
fc.coreContext.Scheduler.GetClusterContext().GetApplication(appID, partition)
}
diff --git a/pkg/shim/scheduler_test.go b/pkg/shim/scheduler_test.go
index e7ee19f3..835b9572 100644
--- a/pkg/shim/scheduler_test.go
+++ b/pkg/shim/scheduler_test.go
@@ -305,6 +305,60 @@ partitions:
assert.Equal(t, 0, len(app.GetAllAllocations()), "allocations were not
removed from the application")
}
+func TestForeignPodTracking(t *testing.T) {
+ configData := `
+partitions:
+ - name: default
+ queues:
+ - name: root
+ submitacl: "*"
+ queues:
+ - name: a
+ resources:
+ guaranteed:
+ memory: 100000000
+ vcore: 10
+ max:
+ memory: 150000000
+ vcore: 20
+`
+ cluster := MockScheduler{}
+ cluster.init()
+ assert.NilError(t, cluster.start(), "failed to start cluster")
+ defer cluster.stop()
+
+ err := cluster.updateConfig(configData, nil)
+ assert.NilError(t, err, "update config failed")
+ addNode(&cluster, "node-1")
+
+ podResource := common.NewResourceBuilder().
+ AddResource(siCommon.Memory, 1000).
+ AddResource(siCommon.CPU, 1).
+ Build()
+ pod1 := createTestPod("root.a", "", "foreign-1", podResource)
+ pod1.Spec.SchedulerName = ""
+ pod1.Spec.NodeName = "node-1"
+ pod2 := createTestPod("root.a", "", "foreign-2", podResource)
+ pod2.Spec.SchedulerName = ""
+ pod2.Spec.NodeName = "node-1"
+
+ cluster.AddPod(pod1)
+ cluster.AddPod(pod2)
+
+ err = cluster.waitAndAssertForeignAllocationInCore(partitionName,
"foreign-1", "node-1", true)
+ assert.NilError(t, err)
+ err = cluster.waitAndAssertForeignAllocationInCore(partitionName,
"foreign-2", "node-1", true)
+ assert.NilError(t, err)
+
+ cluster.DeletePod(pod1)
+ cluster.DeletePod(pod2)
+
+ err = cluster.waitAndAssertForeignAllocationInCore(partitionName,
"foreign-1", "node-1", false)
+ assert.NilError(t, err)
+ err = cluster.waitAndAssertForeignAllocationInCore(partitionName,
"foreign-2", "node-1", false)
+ assert.NilError(t, err)
+}
+
func createTestPod(queue string, appID string, taskID string, taskResource
*si.Resource) *v1.Pod {
containers := make([]v1.Container, 0)
c1Resources := make(map[v1.ResourceName]resource.Quantity)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
