Merge pull request #682 from Jiawei0227/probelog

k8s-ci-robot · web-flow · commit 8dbeb4825f01 · 2021-02-17T11:48:27.000-08:00
Remove Probe logging
diff --git a/pkg/gce-pd-csi-driver/utils.go b/pkg/gce-pd-csi-driver/utils.go
@@ -27,6 +27,8 @@ import (
 	"k8s.io/klog"
 )
 
+var ProbeCSIFullMethod = "/csi.v1.Identity/Probe"
+
 func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
 	return &csi.VolumeCapability_AccessMode{Mode: mode}
 }
@@ -52,6 +54,9 @@ func NewNodeServiceCapability(cap csi.NodeServiceCapability_RPC_Type) *csi.NodeS
 }
 
 func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	if info.FullMethod == ProbeCSIFullMethod {
+		return handler(ctx, req)
+	}
 	klog.V(4).Infof("%s called with request: %+v", info.FullMethod, req)
 	resp, err := handler(ctx, req)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ import (`
`27`	`27`	`"k8s.io/klog"`
`28`	`28`	`)`
`29`	`29`
	`30`	`+var ProbeCSIFullMethod = "/csi.v1.Identity/Probe"`
	`31`	`+`
`30`	`32`	`func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {`
`31`	`33`	`return &csi.VolumeCapability_AccessMode{Mode: mode}`
`32`	`34`	`}`
`@@ -52,6 +54,9 @@ func NewNodeServiceCapability(cap csi.NodeServiceCapability_RPC_Type) *csi.NodeS`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {`
	`57`	`+ if info.FullMethod == ProbeCSIFullMethod {`
	`58`	`+ return handler(ctx, req)`
	`59`	`+ }`
`55`	`60`	`klog.V(4).Infof("%s called with request: %+v", info.FullMethod, req)`
`56`	`61`	`resp, err := handler(ctx, req)`
`57`	`62`	`if err != nil {`