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

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

Browse Source 
fix: return gRPC code "unavailable" if server is not initialized yet
This commit is contained in:
Derek McGowan 2023-12-28 04:30:43 +00:00 committed by GitHub
commit ced9b18c23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/instrument/instrumented_service.go
View File

@ -18,7 +18,6 @@ package instrument
import ( import (
"context" "context"
"errors"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/tracing" "github.com/containerd/containerd/v2/tracing"
@ -63,7 +62,7 @@ func (in *instrumentedService) checkInitialized() error {
if in.c.IsInitialized() { if in.c.IsInitialized() {
return nil 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) { func (in *instrumentedService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandboxRequest) (res *runtime.RunPodSandboxResponse, err error) {