mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
bd4f66c8f1
GetTasks can call GetService and GetNode with the read lock held. These methods try to aquire the read side of the same lock. According to the sync package documentation, this is not safe: > If a goroutine holds a RWMutex for reading, it must not expect this or > any other goroutine to be able to also take the read lock until the > first read lock is released. In particular, this prohibits recursive > read locking. This is to ensure that the lock eventually becomes > available; a blocked Lock call excludes new readers from acquiring the > lock. Fix GetTasks to use the lower-level getService and getNode methods instead. Also, use lockedManagerAction to simplify GetTasks. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
86 lines
2.3 KiB
Go
86 lines
2.3 KiB
Go
package cluster
|
|
|
|
import (
|
|
apitypes "github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
types "github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/daemon/cluster/convert"
|
|
swarmapi "github.com/docker/swarmkit/api"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// GetTasks returns a list of tasks matching the filter options.
|
|
func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, error) {
|
|
var r *swarmapi.ListTasksResponse
|
|
|
|
if err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error {
|
|
filterTransform := func(filter filters.Args) error {
|
|
if filter.Include("service") {
|
|
serviceFilters := filter.Get("service")
|
|
for _, serviceFilter := range serviceFilters {
|
|
service, err := getService(ctx, state.controlClient, serviceFilter, false)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
filter.Del("service", serviceFilter)
|
|
filter.Add("service", service.ID)
|
|
}
|
|
}
|
|
if filter.Include("node") {
|
|
nodeFilters := filter.Get("node")
|
|
for _, nodeFilter := range nodeFilters {
|
|
node, err := getNode(ctx, state.controlClient, nodeFilter)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
filter.Del("node", nodeFilter)
|
|
filter.Add("node", node.ID)
|
|
}
|
|
}
|
|
if !filter.Include("runtime") {
|
|
// default to only showing container tasks
|
|
filter.Add("runtime", "container")
|
|
filter.Add("runtime", "")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
filters, err := newListTasksFilters(options.Filters, filterTransform)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
r, err = state.controlClient.ListTasks(
|
|
ctx,
|
|
&swarmapi.ListTasksRequest{Filters: filters})
|
|
return err
|
|
}); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
tasks := make([]types.Task, 0, len(r.Tasks))
|
|
for _, task := range r.Tasks {
|
|
t, err := convert.TaskFromGRPC(*task)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
tasks = append(tasks, t)
|
|
}
|
|
return tasks, nil
|
|
}
|
|
|
|
// GetTask returns a task by an ID.
|
|
func (c *Cluster) GetTask(input string) (types.Task, error) {
|
|
var task *swarmapi.Task
|
|
if err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error {
|
|
t, err := getTask(ctx, state.controlClient, input)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
task = t
|
|
return nil
|
|
}); err != nil {
|
|
return types.Task{}, err
|
|
}
|
|
return convert.TaskFromGRPC(*task)
|
|
}
|