Skip to content

system deployment tests: fix and annotate counts #27006

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 29, 2025
+16 −12
Merged

system deployment tests: fix and annotate counts #27006

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
28 changes: 16 additions & 12 deletions scheduler/scheduler_system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3495,8 +3495,8 @@ func TestSystemSched_UpdateBlock(t *testing.T) {
expectAllocs: map[string]int{tg1: 2, tg2: 3},
expectStop: map[string]int{tg1: 2, tg2: 3},
expectDState: map[string]*structs.DeploymentState{
tg1: {DesiredTotal: 10, PlacedAllocs: 4},
tg2: {DesiredTotal: 10, PlacedAllocs: 6},
tg1: {DesiredTotal: 10, PlacedAllocs: 4}, // 2 previous + 2 destructive
tg2: {DesiredTotal: 10, PlacedAllocs: 6}, // 3 previous + 3 destructive
},
},

Expand Down Expand Up @@ -3569,8 +3569,8 @@ func TestSystemSched_UpdateBlock(t *testing.T) {
expectAllocs: map[string]int{tg1: 7, tg2: 10},
expectStop: map[string]int{tg1: 2, tg2: 3},
expectDState: map[string]*structs.DeploymentState{
tg1: {DesiredTotal: 10, PlacedAllocs: 7},
tg2: {DesiredTotal: 10, PlacedAllocs: 10},
tg1: {DesiredTotal: 10, PlacedAllocs: 7}, // 2 destructive + 5 new
tg2: {DesiredTotal: 10, PlacedAllocs: 10}, // 3 destructive + 7 new
},
},

Expand All @@ -3585,21 +3585,25 @@ func TestSystemSched_UpdateBlock(t *testing.T) {
},
existingPrevious: map[string][]int{
tg1: {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
tg2: {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
tg2: {0, 1, 2, 3, 4, 5, 6, 7}, // only 8 were previously eligible
},
existingOldDState: map[string]*structs.DeploymentState{
tg1: {DesiredTotal: 10, PlacedAllocs: 10},
tg2: {DesiredTotal: 10, PlacedAllocs: 10},
tg2: {DesiredTotal: 8, PlacedAllocs: 8},
},
expectAllocs: map[string]int{tg1: 2, tg2: 5},
expectStop: map[string]int{tg1: 2, tg2: 5},
expectDState: map[string]*structs.DeploymentState{
tg1: {
DesiredTotal: 10,
DesiredCanaries: 3,
PlacedAllocs: 2,
PlacedCanaries: []string{"0", "1"},
PlacedAllocs: 2, // want 3 canaries, limited by max_parallel
},
tg2: {
DesiredTotal: 10,
PlacedAllocs: 7, // 2 new + 5 destructive updates
},
tg2: {DesiredTotal: 10, PlacedAllocs: 5},
},
},

Expand Down Expand Up @@ -3645,7 +3649,7 @@ func TestSystemSched_UpdateBlock(t *testing.T) {
DesiredTotal: 10,
DesiredCanaries: 3,
PlacedCanaries: []string{"7", "8", "9"},
PlacedAllocs: 5,
PlacedAllocs: 5, // 2 failed + 2 replacements + 1 new
},
tg2: {DesiredTotal: 10, PlacedAllocs: 10},
},
Expand Down Expand Up @@ -3690,7 +3694,7 @@ func TestSystemSched_UpdateBlock(t *testing.T) {
DesiredTotal: 10,
DesiredCanaries: 3,
PlacedCanaries: []string{"7", "8", "9"},
PlacedAllocs: 3,
PlacedAllocs: 3, // 1 existing canary + 2 new canaries
},
tg2: {DesiredTotal: 10, PlacedAllocs: 10},
},
Expand Down Expand Up @@ -3735,7 +3739,7 @@ func TestSystemSched_UpdateBlock(t *testing.T) {
DesiredTotal: 10,
DesiredCanaries: 3,
PlacedCanaries: []string{"7", "8", "9"},
PlacedAllocs: 3,
PlacedAllocs: 3, // unchanged because we're not promoted
},
tg2: {DesiredTotal: 10, PlacedAllocs: 10},
},
Expand Down Expand Up @@ -3777,7 +3781,7 @@ func TestSystemSched_UpdateBlock(t *testing.T) {
DesiredTotal: 10,
DesiredCanaries: 3,
PlacedCanaries: []string{"7", "8", "9"},
PlacedAllocs: 5,
PlacedAllocs: 5, // 3 running canaries + 2 new limited by max_parallel
},
tg2: {DesiredTotal: 10, PlacedAllocs: 10},
},
Expand Down
Loading