Merge pull request #324 from andyzhangx/reduce-logs

andyzhangx · web-flow · commit 33d17ce75215 · 2021-01-20T11:52:56.000+08:00
fix: reduce driver logs
diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml
@@ -32,7 +32,7 @@ spec:
         - name: csi-provisioner
           image: {{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}
           args:
-            - "-v=5"
+            - "-v=2"
             - "--csi-address=$(ADDRESS)"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
@@ -127,7 +127,7 @@ spec:
           image: "{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
           args:
             - "-csi-address=$(ADDRESS)"
-            - "-v=5"
+            - "-v=2"
             - "-leader-election"
             - '-handle-volume-inuse-error=false'
           env:
diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml
@@ -42,7 +42,7 @@ spec:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
             - --health-port=29633
-            - --v=5
+            - --v=2
           resources:
             limits:
               cpu: 100m
@@ -55,7 +55,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v=5
+            - --v=2
           lifecycle:
             preStop:
               exec:
diff --git a/deploy/csi-blob-controller.yaml b/deploy/csi-blob-controller.yaml
@@ -28,7 +28,7 @@ spec:
         - name: csi-provisioner
           image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v1.4.0
           args:
-            - "-v=5"
+            - "-v=2"
             - "--csi-address=$(ADDRESS)"
             - "--enable-leader-election"
             - "--leader-election-type=leases"
@@ -112,7 +112,7 @@ spec:
           image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.1.0
           args:
             - "-csi-address=$(ADDRESS)"
-            - "-v=5"
+            - "-v=2"
             - "-leader-election"
             - '-handle-volume-inuse-error=false'
           env:
diff --git a/deploy/csi-blob-node.yaml b/deploy/csi-blob-node.yaml
@@ -40,7 +40,7 @@ spec:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
             - --health-port=29633
-            - --v=5
+            - --v=2
           resources:
             limits:
               cpu: 100m
@@ -53,7 +53,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v=5
+            - --v=2
           lifecycle:
             preStop:
               exec:
diff --git a/pkg/blob/controllerserver.go b/pkg/blob/controllerserver.go
@@ -310,8 +310,6 @@ func (d *Driver) ValidateVolumeCapabilities(ctx context.Context, req *csi.Valida
 
 // ControllerGetCapabilities returns the capabilities of the Controller plugin
 func (d *Driver) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
-	klog.V(5).Infof("Using default ControllerGetCapabilities")
-
 	return &csi.ControllerGetCapabilitiesResponse{
 		Capabilities: d.Cap,
 	}, nil
diff --git a/pkg/csi-common/controllerserver-default.go b/pkg/csi-common/controllerserver-default.go
@@ -17,8 +17,6 @@ limitations under the License.
 package csicommon
 
 import (
-	"k8s.io/klog/v2"
-
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
@@ -46,8 +44,6 @@ func (cs *DefaultControllerServer) ControllerUnpublishVolume(ctx context.Context
 }
 
 func (cs *DefaultControllerServer) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
-	klog.V(5).Infof("Using default ValidateVolumeCapabilities")
-
 	for _, c := range req.GetVolumeCapabilities() {
 		found := false
 		for _, c1 := range cs.Driver.VC {
@@ -77,8 +73,6 @@ func (cs *DefaultControllerServer) GetCapacity(ctx context.Context, req *csi.Get
 // ControllerGetCapabilities implements the default GRPC callout.
 // Default supports all capabilities
 func (cs *DefaultControllerServer) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
-	klog.V(5).Infof("Using default ControllerGetCapabilities")
-
 	return &csi.ControllerGetCapabilitiesResponse{
 		Capabilities: cs.Driver.Cap,
 	}, nil
diff --git a/pkg/csi-common/driver_test.go b/pkg/csi-common/driver_test.go
@@ -71,7 +71,6 @@ func TestAddControllerServiceCapabilities(t *testing.T) {
 }
 
 func TestGetVolumeCapabilityAccessModes(t *testing.T) {
-
 	d := NewFakeDriver()
 
 	// Test no volume access modes.
diff --git a/pkg/csi-common/identityserver-default.go b/pkg/csi-common/identityserver-default.go
@@ -21,16 +21,13 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/klog/v2"
 )
 
 type DefaultIdentityServer struct {
 	Driver *CSIDriver
 }
 
 func (ids *DefaultIdentityServer) GetPluginInfo(ctx context.Context, req *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {
-	klog.V(5).Infof("Using default GetPluginInfo")
-
 	if ids.Driver.Name == "" {
 		return nil, status.Error(codes.Unavailable, "Driver name not configured")
 	}
@@ -50,7 +47,6 @@ func (ids *DefaultIdentityServer) Probe(ctx context.Context, req *csi.ProbeReque
 }
 
 func (ids *DefaultIdentityServer) GetPluginCapabilities(ctx context.Context, req *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
-	klog.V(5).Infof("Using default capabilities")
 	return &csi.GetPluginCapabilitiesResponse{
 		Capabilities: []*csi.PluginCapability{
 			{
diff --git a/pkg/csi-common/nodeserver-default.go b/pkg/csi-common/nodeserver-default.go
@@ -19,24 +19,19 @@ package csicommon
 import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"golang.org/x/net/context"
-	"k8s.io/klog/v2"
 )
 
 type DefaultNodeServer struct {
 	Driver *CSIDriver
 }
 
 func (ns *DefaultNodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
-	klog.V(5).Infof("Using default NodeGetInfo")
-
 	return &csi.NodeGetInfoResponse{
 		NodeId: ns.Driver.NodeID,
 	}, nil
 }
 
 func (ns *DefaultNodeServer) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
-	klog.V(2).Infof("Using default NodeGetCapabilities")
-
 	return &csi.NodeGetCapabilitiesResponse{
 		Capabilities: ns.Driver.NSCap,
 	}, nil
diff --git a/pkg/csi-common/server.go b/pkg/csi-common/server.go
@@ -68,7 +68,6 @@ func (s *nonBlockingGRPCServer) ForceStop() {
 }
 
 func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, cs csi.ControllerServer, ns csi.NodeServer, testMode bool) {
-
 	proto, addr, err := ParseEndpoint(endpoint)
 	if err != nil {
 		klog.Fatal(err.Error())
diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go
@@ -81,36 +81,44 @@ func NewNodeServiceCapability(cap csi.NodeServiceCapability_RPC_Type) *csi.NodeS
 
 func RunNodePublishServer(endpoint string, d *CSIDriver, ns csi.NodeServer, testMode bool) {
 	ids := NewDefaultIdentityServer(d)
-
 	s := NewNonBlockingGRPCServer()
 	s.Start(endpoint, ids, nil, ns, testMode)
 	s.Wait()
 }
 
 func RunControllerPublishServer(endpoint string, d *CSIDriver, cs csi.ControllerServer, testMode bool) {
 	ids := NewDefaultIdentityServer(d)
-
 	s := NewNonBlockingGRPCServer()
 	s.Start(endpoint, ids, cs, nil, testMode)
 	s.Wait()
 }
 
 func RunControllerandNodePublishServer(endpoint string, d *CSIDriver, cs csi.ControllerServer, ns csi.NodeServer, testMode bool) {
 	ids := NewDefaultIdentityServer(d)
-
 	s := NewNonBlockingGRPCServer()
 	s.Start(endpoint, ids, cs, ns, testMode)
 	s.Wait()
 }
 
+func getLogLevel(method string) int32 {
+	if method == "/csi.v1.Identity/Probe" ||
+		method == "/csi.v1.Node/NodeGetCapabilities" ||
+		method == "/csi.v1.Node/NodeGetVolumeStats" {
+		return 10
+	}
+	return 2
+}
+
 func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
-	klog.V(3).Infof("GRPC call: %s", info.FullMethod)
-	klog.V(5).Infof("GRPC request: %s", protosanitizer.StripSecrets(req))
+	level := klog.Level(getLogLevel(info.FullMethod))
+	klog.V(level).Infof("GRPC call: %s", info.FullMethod)
+	klog.V(level).Infof("GRPC request: %s", protosanitizer.StripSecrets(req))
+
 	resp, err := handler(ctx, req)
 	if err != nil {
 		klog.Errorf("GRPC error: %v", err)
 	} else {
-		klog.V(5).Infof("GRPC response: %s", protosanitizer.StripSecrets(resp))
+		klog.V(level).Infof("GRPC response: %s", protosanitizer.StripSecrets(resp))
 	}
 	return resp, err
 }
diff --git a/pkg/csi-common/utils_test.go b/pkg/csi-common/utils_test.go
@@ -197,3 +197,38 @@ func TestNewNodeServiceCapability(t *testing.T) {
 		assert.Equal(t, resp.XXX_sizecache, int32(0))
 	}
 }
+
+func TestGetLogLevel(t *testing.T) {
+	tests := []struct {
+		method string
+		level  int32
+	}{
+		{
+			method: "/csi.v1.Identity/Probe",
+			level:  10,
+		},
+		{
+			method: "/csi.v1.Node/NodeGetCapabilities",
+			level:  10,
+		},
+		{
+			method: "/csi.v1.Node/NodeGetVolumeStats",
+			level:  10,
+		},
+		{
+			method: "",
+			level:  2,
+		},
+		{
+			method: "unknown",
+			level:  2,
+		},
+	}
+
+	for _, test := range tests {
+		level := getLogLevel(test.method)
+		if level != test.level {
+			t.Errorf("returned level: (%v), expected level: (%v)", level, test.level)
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ func TestAddControllerServiceCapabilities(t *testing.T) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`func TestGetVolumeCapabilityAccessModes(t *testing.T) {`
`74`		`-`
`75`	`74`	`d := NewFakeDriver()`
`76`	`75`
`77`	`76`	`// Test no volume access modes.`
Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,13 @@ import (`
`21`	`21`	`"golang.org/x/net/context"`
`22`	`22`	`"google.golang.org/grpc/codes"`
`23`	`23`	`"google.golang.org/grpc/status"`
`24`		`- "k8s.io/klog/v2"`
`25`	`24`	`)`
`26`	`25`
`27`	`26`	`type DefaultIdentityServer struct {`
`28`	`27`	`Driver *CSIDriver`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`func (ids DefaultIdentityServer) GetPluginInfo(ctx context.Context, req csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {`
`32`		`- klog.V(5).Infof("Using default GetPluginInfo")`
`33`		`-`
`34`	`31`	`if ids.Driver.Name == "" {`
`35`	`32`	`return nil, status.Error(codes.Unavailable, "Driver name not configured")`
`36`	`33`	`}`
`@@ -50,7 +47,6 @@ func (ids DefaultIdentityServer) Probe(ctx context.Context, req csi.ProbeReque`
`50`	`47`	`}`
`51`	`48`
`52`	`49`	`func (ids DefaultIdentityServer) GetPluginCapabilities(ctx context.Context, req csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {`
`53`		`- klog.V(5).Infof("Using default capabilities")`
`54`	`50`	`return &csi.GetPluginCapabilitiesResponse{`
`55`	`51`	`Capabilities: []*csi.PluginCapability{`
`56`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ func (s *nonBlockingGRPCServer) ForceStop() {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, cs csi.ControllerServer, ns csi.NodeServer, testMode bool) {`
`71`		`-`
`72`	`71`	`proto, addr, err := ParseEndpoint(endpoint)`
`73`	`72`	`if err != nil {`
`74`	`73`	`klog.Fatal(err.Error())`