mirror of
https://github.com/psviderski/uncloud.git
synced 2026-08-26 11:03:34 +00:00
fix: compose deployment: use mutex to correctly collect service specs
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/compose-spec/compose-go/v2/graph"
|
"github.com/compose-spec/compose-go/v2/graph"
|
||||||
"github.com/compose-spec/compose-go/v2/types"
|
"github.com/compose-spec/compose-go/v2/types"
|
||||||
@@ -60,14 +61,17 @@ func (d *Deployment) Plan(ctx context.Context) (deploy.SequenceOperation, error)
|
|||||||
|
|
||||||
// Generate service specs for all services in the project.
|
// Generate service specs for all services in the project.
|
||||||
var serviceSpecs []api.ServiceSpec
|
var serviceSpecs []api.ServiceSpec
|
||||||
|
var mu sync.Mutex
|
||||||
err := graph.InDependencyOrder(ctx, d.Project,
|
err := graph.InDependencyOrder(ctx, d.Project,
|
||||||
func(ctx context.Context, name string, _ types.ServiceConfig) error {
|
func(ctx context.Context, name string, _ types.ServiceConfig) error {
|
||||||
spec, err := d.ServiceSpec(name)
|
spec, err := d.ServiceSpec(name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
// The graph is traversed concurrently, so we need to use a mutex to protect the shared slice.
|
||||||
|
mu.Lock()
|
||||||
serviceSpecs = append(serviceSpecs, spec)
|
serviceSpecs = append(serviceSpecs, spec)
|
||||||
|
mu.Unlock()
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user