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

Merge pull request #3444 from crosbymichael/state-timeout

Browse Source 
Add timeout to task state calls
This commit is contained in:
Michael Crosby 2019-07-25 12:55:11 -04:00 committed by GitHub
commit 41e172352c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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")