[release/1.4 backport] Return GRPC not found error instead of plain one

danail-branekov · danail-branekov · commit 8cff6b3753ff · 2020-12-22T09:55:13.000+02:00
When the shim returns a plain error when a process does not exist, the server is unable to recognise its GRPC status code and assumes UnknownError. This is awkward for containerd client users as they are unable to recognise the actual reason for the error. When the shim returns a NotFound GRPC error, it is properly translated by the server and clients receive a proper NotFound error instead of Unknown Co-authored-by: Danail Branekov <danailster@gmail.com> Co-authored-by: Georgi Sabev <georgethebeatle@gmail.com> Signed-off-by: Danail Branekov <danailster@gmail.com> Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com> (cherry picked from commit 7451dd1)
diff --git a/container_linux_test.go b/container_linux_test.go
@@ -1068,6 +1068,10 @@ func TestContainerLoadUnexistingProcess(t *testing.T) {
 		t.Fatal("an error should have occurred when loading a process that does not exist")
 	}
 
+	if !errdefs.IsNotFound(err) {
+		t.Fatalf("an error of type NotFound should have been returned when loading a process that does not exist, got %#v instead ", err)
+	}
+
 	if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
 		t.Error(err)
 	}
diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go
@@ -483,7 +483,7 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
 	}
 	p, err := container.Process(r.ExecID)
 	if err != nil {
-		return nil, err
+		return nil, errdefs.ToGRPC(err)
 	}
 	st, err := p.Status(ctx)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1068,6 +1068,10 @@ func TestContainerLoadUnexistingProcess(t *testing.T) {`
`1068`	`1068`	`t.Fatal("an error should have occurred when loading a process that does not exist")`
`1069`	`1069`	`}`
`1070`	`1070`
	`1071`	`+ if !errdefs.IsNotFound(err) {`
	`1072`	`+ t.Fatalf("an error of type NotFound should have been returned when loading a process that does not exist, got %#v instead ", err)`
	`1073`	`+ }`
	`1074`	`+`
`1071`	`1075`	`if err := task.Kill(ctx, syscall.SIGKILL); err != nil {`
`1072`	`1076`	`t.Error(err)`
`1073`	`1077`	`}`
Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ func (s service) State(ctx context.Context, r taskAPI.StateRequest) (*taskAPI.`
`483`	`483`	`}`
`484`	`484`	`p, err := container.Process(r.ExecID)`
`485`	`485`	`if err != nil {`
`486`		`- return nil, err`
	`486`	`+ return nil, errdefs.ToGRPC(err)`
`487`	`487`	`}`
`488`	`488`	`st, err := p.Status(ctx)`
`489`	`489`	`if err != nil {`