Merge pull request #4872 from masters-of-cats/pr-process-not-found-err-14

estesp · web-flow · commit ed8ec974906d · 2020-12-23T08:09:55.000-05:00
[release/1.4 backport] Return GRPC not found error instead of plain one
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 {`