Skip to content

system deployment tests: fix port collisions #27004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2025
+35 −5
Merged

system deployment tests: fix port collisions #27004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions scheduler/scheduler_system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3383,8 +3383,8 @@ func TestEvictAndPlace(t *testing.T) {

}

// TestSystemScheduler_UpdateBlock tests various permutations of the update block
func TestSystemScheduler_UpdateBlock(t *testing.T) {
// TestSystemSched_UpdateBlock tests various permutations of the update block
func TestSystemSched_UpdateBlock(t *testing.T) {
ci.Parallel(t)

collect := func(planned map[string][]*structs.Allocation) map[string]int {
Expand Down Expand Up @@ -3799,6 +3799,15 @@ func TestSystemScheduler_UpdateBlock(t *testing.T) {
taskGroup2.Name = tg2
oldJob.TaskGroups = append(oldJob.TaskGroups, taskGroup2)

// make sure tg1 network matches AllocForNode
taskGroup1 := oldJob.TaskGroups[0]
taskGroup1.Networks = []*structs.NetworkResource{{
ReservedPorts: []structs.Port{{
Label: "admin", Value: 5000, HostNetwork: "default"}},
DynamicPorts: []structs.Port{{
Label: "http", Value: 9876, HostNetwork: "default"}},
}}

must.NoError(t, h.State.UpsertJob(
structs.MsgTypeTestSetup, h.NextIndex(), nil, oldJob))

Expand Down Expand Up @@ -3829,7 +3838,14 @@ func TestSystemScheduler_UpdateBlock(t *testing.T) {
for _, tg := range []string{tg1, tg2} {
nodesToAllocs := map[string]string{}
for _, nodeIdx := range tc.existingPrevious[tg] {
alloc := mock.AllocForNode(nodes[nodeIdx])
var alloc *structs.Allocation
if tg == tg2 {
alloc = mock.AllocForNodeWithoutReservedPort(nodes[nodeIdx])
} else {
// make sure alloc matches tg1.Networks
alloc = mock.AllocForNode(nodes[nodeIdx])
alloc.TaskResources["web"].Networks = nil
}
alloc.Job = oldJob
alloc.JobID = job.ID
alloc.TaskGroup = tg
Expand All @@ -3839,7 +3855,14 @@ func TestSystemScheduler_UpdateBlock(t *testing.T) {
existAllocs = append(existAllocs, alloc)
}
for _, nodeIdx := range tc.existingRunning[tg] {
alloc := mock.AllocForNode(nodes[nodeIdx])
var alloc *structs.Allocation
if tg == tg2 {
alloc = mock.AllocForNodeWithoutReservedPort(nodes[nodeIdx])
} else {
// make sure alloc matches tg1.Networks
alloc = mock.AllocForNode(nodes[nodeIdx])
alloc.TaskResources["web"].Networks = nil
}
alloc.Job = job
alloc.JobID = job.ID
alloc.TaskGroup = tg
Expand All @@ -3861,7 +3884,14 @@ func TestSystemScheduler_UpdateBlock(t *testing.T) {
existAllocs = append(existAllocs, alloc)
}
for _, nodeIdx := range tc.existingFailed[tg] {
alloc := mock.AllocForNode(nodes[nodeIdx])
var alloc *structs.Allocation
if tg == tg2 {
alloc = mock.AllocForNodeWithoutReservedPort(nodes[nodeIdx])
} else {
// make sure alloc matches tg1.Networks
alloc = mock.AllocForNode(nodes[nodeIdx])
alloc.TaskResources["web"].Networks = nil
}
alloc.Job = job
alloc.JobID = job.ID
alloc.TaskGroup = tg
Expand Down