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

Update execution.getTask() to provide more fine grained error

Browse Source 
This allow returning a more meaningful message when a request context
doesn't hold a namespace.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-06-21 15:28:45 -07:00
parent 2fdb8020c4
commit 40ce7665bd
No known key found for this signature in database
GPG Key ID: 40CF16616B361216
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
services/tasks/service.go
View File

@ -112,13 +112,8 @@ func (s *Service) Create(ctx context.Context, r *api.CreateTaskRequest) (*api.Cr
}
}
var container containers.Container
if err := s.db.View(func(tx *bolt.Tx) error {
store := metadata.NewContainerStore(tx)
var err error
container, err = store.Get(ctx, r.ContainerID)
return err
}); err != nil {
container, err := s.getContainer(ctx, r.ContainerID)
if err != nil {
switch {
case metadata.IsNotFound(err):
return nil, grpc.Errorf(codes.NotFound, "container %v not found", r.ContainerID)
@ -476,14 +471,38 @@ func (s *Service) writeContent(ctx context.Context, mediaType, ref string, r io.
}, nil
}
func (s *Service) getContainer(ctx context.Context, id string) (containers.Container, error) {
var container containers.Container
if err := s.db.View(func(tx *bolt.Tx) error {
store := metadata.NewContainerStore(tx)
var err error
container, err = store.Get(ctx, id)
return err
}); err != nil {
return containers.Container{}, err
}
return container, nil
}
func (s *Service) getTask(ctx context.Context, id string) (plugin.Task, error) {
for _, r := range s.runtimes {
t, err := r.Get(ctx, id)
if err == nil {
return t, nil
container, err := s.getContainer(ctx, id)
if err != nil {
return nil, grpc.Errorf(codes.InvalidArgument, "task %v not found: %s", id, err.Error())
}
runtime, err := s.getRuntime(container.Runtime.Name)
if err != nil {
return nil, grpc.Errorf(codes.NotFound, "task %v not found: %s", id, err.Error())
}
t, err := runtime.Get(ctx, id)
if err != nil {
return nil, grpc.Errorf(codes.NotFound, "task %v not found", id)
}
return t, nil
}
func (s *Service) getRuntime(name string) (plugin.Runtime, error) {