Merge pull request containerd#9565 from koct9i/fix-return-grpc-code-unavailable-if-not-initialized

dmcgowan · web-flow · commit ced9b18c231a · 2023-12-28T04:30:43.000Z
fix: return gRPC code "unavailable" if server is not initialized yet
diff --git a/pkg/cri/instrument/instrumented_service.go b/pkg/cri/instrument/instrumented_service.go
@@ -18,7 +18,6 @@ package instrument
 
 import (
 	"context"
-	"errors"
 
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/tracing"
@@ -63,7 +62,7 @@ func (in *instrumentedService) checkInitialized() error {
 	if in.c.IsInitialized() {
 		return nil
 	}
-	return errors.New("server is not initialized yet")
+	return errdefs.ToGRPCf(errdefs.ErrUnavailable, "server is not initialized yet")
 }
 
 func (in *instrumentedService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandboxRequest) (res *runtime.RunPodSandboxResponse, err error) {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ package instrument`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`		`- "errors"`
`22`	`21`
`23`	`22`	`"github.com/containerd/containerd/v2/errdefs"`
`24`	`23`	`"github.com/containerd/containerd/v2/tracing"`
`@@ -63,7 +62,7 @@ func (in *instrumentedService) checkInitialized() error {`
`63`	`62`	`if in.c.IsInitialized() {`
`64`	`63`	`return nil`
`65`	`64`	`}`
`66`		`- return errors.New("server is not initialized yet")`
	`65`	`+ return errdefs.ToGRPCf(errdefs.ErrUnavailable, "server is not initialized yet")`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`func (in instrumentedService) RunPodSandbox(ctx context.Context, r runtime.RunPodSandboxRequest) (res *runtime.RunPodSandboxResponse, err error) {`