diff --git a/vendor.mod b/vendor.mod index c7c4591c8d..78cf946c1d 100644 --- a/vendor.mod +++ b/vendor.mod @@ -69,7 +69,7 @@ require ( github.com/moby/locker v1.0.1 github.com/moby/patternmatcher v0.6.0 github.com/moby/pubsub v1.0.0 - github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554 + github.com/moby/swarmkit/v2 v2.0.0-20250613170222-a45be3cac15c github.com/moby/sys/atomicwriter v0.1.0 github.com/moby/sys/mount v0.3.4 github.com/moby/sys/mountinfo v0.7.2 diff --git a/vendor.sum b/vendor.sum index daa74e274f..465c1a4673 100644 --- a/vendor.sum +++ b/vendor.sum @@ -398,8 +398,8 @@ github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkV github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/pubsub v1.0.0 h1:jkp/imWsmJz2f6LyFsk7EkVeN2HxR/HTTOY8kHrsxfA= github.com/moby/pubsub v1.0.0/go.mod h1:bXSO+3h5MNXXCaEG+6/NlAIk7MMZbySZlnB+cUQhKKc= -github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554 h1:DMHJbgyNZWyrPKYjCYt2IxEO7KA0eSd4fo6KQsv2W84= -github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554/go.mod h1:mTTGIAz/59OGZR5Qe+QByIe3Nxc+sSuJkrsStFhr6Lg= +github.com/moby/swarmkit/v2 v2.0.0-20250613170222-a45be3cac15c h1:UozDZWdYHjSYr56LIX6kMaVkY5D3ntH/UnW5+3PsLZQ= +github.com/moby/swarmkit/v2 v2.0.0-20250613170222-a45be3cac15c/go.mod h1:mTTGIAz/59OGZR5Qe+QByIe3Nxc+sSuJkrsStFhr6Lg= github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs= github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww= diff --git a/vendor/github.com/moby/swarmkit/v2/manager/scheduler/scheduler.go b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/scheduler.go index 8eb96cf816..76508af303 100644 --- a/vendor/github.com/moby/swarmkit/v2/manager/scheduler/scheduler.go +++ b/vendor/github.com/moby/swarmkit/v2/manager/scheduler/scheduler.go @@ -787,9 +787,11 @@ func (s *Scheduler) scheduleNTasksOnSubtree(ctx context.Context, n int, taskGrou // Try to make branches even until either all branches are // full, or all tasks have been scheduled. - for tasksScheduled != n && len(noRoom) != len(tree.next) { + converging := true + for tasksScheduled != n && len(noRoom) != len(tree.next) && converging { desiredTasksPerBranch := (tasksInUsableBranches + n - tasksScheduled) / (len(tree.next) - len(noRoom)) remainder := (tasksInUsableBranches + n - tasksScheduled) % (len(tree.next) - len(noRoom)) + converging = false for _, subtree := range tree.next { if noRoom != nil { @@ -799,6 +801,7 @@ func (s *Scheduler) scheduleNTasksOnSubtree(ctx context.Context, n int, taskGrou } subtreeTasks := subtree.tasks if subtreeTasks < desiredTasksPerBranch || (subtreeTasks == desiredTasksPerBranch && remainder > 0) { + converging = true tasksToAssign := desiredTasksPerBranch - subtreeTasks if remainder > 0 { tasksToAssign++ diff --git a/vendor/modules.txt b/vendor/modules.txt index 235a846a65..1e34197759 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -945,7 +945,7 @@ github.com/moby/patternmatcher/ignorefile # github.com/moby/pubsub v1.0.0 ## explicit; go 1.19 github.com/moby/pubsub -# github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554 +# github.com/moby/swarmkit/v2 v2.0.0-20250613170222-a45be3cac15c ## explicit; go 1.18 github.com/moby/swarmkit/v2/agent github.com/moby/swarmkit/v2/agent/configs