mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-14 10:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add recover middleware for grpc server

Browse Source 
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna
2019-07-30 18:56:48 +05:30
committed by mergify[bot]
parent 2805135e76
commit 8a7022cc50
25 changed files with 9606 additions and 3741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/csi-common/server.go
View File

@ -22,6 +22,7 @@ import (
"sync"
"github.com/container-storage-interface/spec/lib/go/csi"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"google.golang.org/grpc"
"k8s.io/klog"
)
@ -91,7 +92,10 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c
}
opts := []grpc.ServerOption{
grpc.UnaryInterceptor(logGRPC),
grpc_middleware.WithUnaryServerChain(
logGRPC,
panicHandler,
),
}
server := grpc.NewServer(opts...)
s.server = server

15
pkg/csi-common/utils.go
View File

@ -18,12 +18,15 @@ package csicommon
import (
"fmt"
"runtime/debug"
"strings"
"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"k8s.io/klog"
)
@ -112,3 +115,15 @@ func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, h
}
return resp, err
}
func panicHandler(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
defer func() {
if r := recover(); r != nil {
klog.Errorf("panic occurred: %v", r)
debug.PrintStack()
err = status.Errorf(codes.Internal, "panic %v", r)
}
}()
return handler(ctx, req)
}