0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

integration/internal/swarm: rename max/min as it collides with go1.21 builtin

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fa13b0715f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-26 19:44:11 +02:00
parent 4e11c149d1
commit 51dc5fb58f
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
integration/internal/swarm/states.go
View file

@ -95,12 +95,8 @@ func JobComplete(client client.CommonAPIClient, service swarmtypes.Service) func
jobIteration = service.JobStatus.JobIteration
}
maxRaw := service.Spec.Mode.ReplicatedJob.MaxConcurrent
totalRaw := service.Spec.Mode.ReplicatedJob.TotalCompletions
max := int(*maxRaw)
total := int(*totalRaw)
maxConcurrent := int(*service.Spec.Mode.ReplicatedJob.MaxConcurrent)
totalCompletions := int(*service.Spec.Mode.ReplicatedJob.TotalCompletions)
previousResult := ""
return func(log poll.LogT) poll.Result {
@ -134,16 +130,16 @@ func JobComplete(client client.CommonAPIClient, service swarmtypes.Service) func
}
switch {
case running > max:
case running > maxConcurrent:
return poll.Error(fmt.Errorf(
"number of running tasks (%v) exceeds max (%v)", running, max,
"number of running tasks (%v) exceeds max (%v)", running, maxConcurrent,
))
case (completed + running) > total:
case (completed + running) > totalCompletions:
return poll.Error(fmt.Errorf(
"number of tasks exceeds total (%v), %v running and %v completed",
total, running, completed,
totalCompletions, running, completed,
))
case completed == total && running == 0:
case completed == totalCompletions && running == 0:
return poll.Success()
default:
newRes := fmt.Sprintf(
@ -157,7 +153,7 @@ func JobComplete(client client.CommonAPIClient, service swarmtypes.Service) func
return poll.Continue(
"Job not yet finished, %v completed and %v running out of %v total",
completed, running, total,
completed, running, totalCompletions,
)
}
}