github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add timeout to task state calls

Browse Source 
Fixes #3440

This also returns the task that times out or has an error on the state
call in an UNKNOWN status so that the user can manually kill and remove
the task.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2019-07-23 19:52:42 +00:00
parent f7761411b8
commit 101d4b78eb
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/tasks/local.go
View File

@ -266,12 +266,18 @@ func (l *local) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest,
}, nil }, nil
} }
func processFromContainerd(ctx context.Context, p runtime.Process) (*task.Process, error) { func getProcessState(ctx context.Context, p runtime.Process) (*task.Process, error) {
ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
defer cancel()
state, err := p.State(ctx) state, err := p.State(ctx)
if err != nil { if err != nil {
if errdefs.IsNotFound(err) {
return nil, err return nil, err
} }
var status task.Status log.G(ctx).WithError(err).Errorf("get state for %s", p.ID())
}
status := task.StatusUnknown
switch state.Status { switch state.Status {
case runtime.CreatedStatus: case runtime.CreatedStatus:
status = task.StatusCreated status = task.StatusCreated
@ -310,7 +316,7 @@ func (l *local) Get(ctx context.Context, r *api.GetRequest, _ ...grpc.CallOption
return nil, errdefs.ToGRPC(err) return nil, errdefs.ToGRPC(err)
} }
} }
t, err := processFromContainerd(ctx, p) t, err := getProcessState(ctx, p)
if err != nil { if err != nil {
return nil, errdefs.ToGRPC(err) return nil, errdefs.ToGRPC(err)
} }
@ -333,7 +339,7 @@ func (l *local) List(ctx context.Context, r *api.ListTasksRequest, _ ...grpc.Cal
func addTasks(ctx context.Context, r *api.ListTasksResponse, tasks []runtime.Task) { func addTasks(ctx context.Context, r *api.ListTasksResponse, tasks []runtime.Task) {
for _, t := range tasks { for _, t := range tasks {
tt, err := processFromContainerd(ctx, t) tt, err := getProcessState(ctx, t)
if err != nil { if err != nil {
if !errdefs.IsNotFound(err) { // handle race with deletion if !errdefs.IsNotFound(err) { // handle race with deletion
log.G(ctx).WithError(err).WithField("id", t.ID()).Error("converting task to protobuf") log.G(ctx).WithError(err).WithField("id", t.ID()).Error("converting task to protobuf")