Skip to content

Commit 7714ec2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #279 from Jiawei0227/klog
Use klog for mock CSI driver logging
2 parents 0b35d6b + ada4fdc commit 7714ec2

18 files changed

+1864
-26
lines changed

‎cmd/mock-driver/main.go

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,16 @@ import (
2828
"github.com/kubernetes-csi/csi-test/v4/driver"
2929
"github.com/kubernetes-csi/csi-test/v4/mock/service"
3030
"gopkg.in/yaml.v2"
31+
"k8s.io/klog"
3132
)
3233

34+
func init() {
35+
// klog verbosity guide for this package
36+
// Use V(2) for one time config information
37+
// Use V(3) for general debug information logging
38+
klog.InitFlags(flag.CommandLine)
39+
}
40+
3341
func main() {
3442
var config service.Config
3543
var hooksFile string = ""
@@ -56,7 +64,7 @@ func main() {
5664
if err == nil {
5765
config.ExecHooks = execHooks
5866
} else {
59-
fmt.Printf("Failed to load hooks file %s: %v", hooksFile, err)
67+
klog.Errorf("Failed to load hooks file %s: %v", hooksFile, err)
6068
}
6169
}
6270

@@ -80,20 +88,18 @@ func main() {
8088
// Listen
8189
l, cleanup, err := listen(endpoint)
8290
if err != nil {
83-
fmt.Printf("Error: Unable to listen on %s socket: %v\n",
91+
klog.Exitf("Error: Unable to listen on %s socket: %v\n",
8492
endpoint,
8593
err)
86-
os.Exit(1)
8794
}
8895
defer cleanup()
8996

9097
// Start server
9198
if err := d.Start(l); err != nil {
92-
fmt.Printf("Error: Unable to start mock CSI server: %v\n",
99+
klog.Exitf("Error: Unable to start mock CSI server: %v\n",
93100
err)
94-
os.Exit(1)
95101
}
96-
fmt.Println("mock driver started")
102+
klog.Info("mock driver started")
97103

98104
// Wait for signal
99105
sigc := make(chan os.Signal, 1)
@@ -107,7 +113,7 @@ func main() {
107113

108114
<-sigc
109115
d.Stop()
110-
fmt.Println("mock driver stopped")
116+
klog.Info("mock driver stopped")
111117
} else {
112118
controllerServer := &driver.CSIDriverControllerServer{
113119
Controller: s,
@@ -130,38 +136,34 @@ func main() {
130136
// Listen controller.
131137
l, cleanupController, err := listen(controllerEndpoint)
132138
if err != nil {
133-
fmt.Printf("Error: Unable to listen on %s socket: %v\n",
139+
klog.Exitf("Error: Unable to listen on %s socket: %v\n",
134140
controllerEndpoint,
135141
err)
136-
os.Exit(1)
137142
}
138143
defer cleanupController()
139144

140145
// Start controller server.
141146
if err = dc.Start(l); err != nil {
142-
fmt.Printf("Error: Unable to start mock CSI controller server: %v\n",
147+
klog.Exitf("Error: Unable to start mock CSI controller server: %v\n",
143148
err)
144-
os.Exit(1)
145149
}
146-
fmt.Println("mock controller driver started")
150+
klog.Infof("mock controller driver started")
147151

148152
// Listen node.
149153
l, cleanupNode, err := listen(endpoint)
150154
if err != nil {
151-
fmt.Printf("Error: Unable to listen on %s socket: %v\n",
155+
klog.Exitf("Error: Unable to listen on %s socket: %v\n",
152156
endpoint,
153157
err)
154-
os.Exit(1)
155158
}
156159
defer cleanupNode()
157160

158161
// Start node server.
159162
if err = dn.Start(l); err != nil {
160-
fmt.Printf("Error: Unable to start mock CSI node server: %v\n",
163+
klog.Exitf("Error: Unable to start mock CSI node server: %v\n",
161164
err)
162-
os.Exit(1)
163165
}
164-
fmt.Println("mock node driver started")
166+
klog.Infof("mock node driver started")
165167

166168
// Wait for signal
167169
sigc := make(chan os.Signal, 1)
@@ -176,7 +178,7 @@ func main() {
176178
<-sigc
177179
dc.Stop()
178180
dn.Stop()
179-
fmt.Println("mock drivers stopped")
181+
klog.Infof("mock drivers stopped")
180182
}
181183
}
182184

@@ -226,6 +228,6 @@ func parseHooksFile(file string) (*service.Hooks, error) {
226228
if err != nil {
227229
return nil, err
228230
}
229-
fmt.Printf("Hooks file %s loaded\n", file)
231+
klog.V(2).Infof("Hooks file %s loaded\n", file)
230232
return &hooks, err
231233
}

‎driver/driver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222
"context"
2323
"encoding/json"
2424
"errors"
25-
"fmt"
2625
"net"
2726
"sync"
2827

2928
"google.golang.org/grpc/codes"
3029
"google.golang.org/grpc/status"
30+
"k8s.io/klog"
3131

3232
"github.com/container-storage-interface/spec/lib/go/csi"
3333
"google.golang.org/grpc"
@@ -236,7 +236,7 @@ func logGRPC(method string, request, reply interface{}, err error) {
236236
}
237237

238238
msg, _ := json.Marshal(logMessage)
239-
fmt.Printf("gRPCCall: %s\n", msg)
239+
klog.V(3).Infof("gRPCCall: %s\n", msg)
240240
}
241241

242242
func isAuthenticated(req interface{}, creds *CSICreds) (bool, error) {

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ require (
1919
google.golang.org/grpc v1.25.1
2020
gopkg.in/sourcemap.v1 v1.0.5 // indirect
2121
gopkg.in/yaml.v2 v2.2.5
22+
k8s.io/klog v1.0.0
2223
)

‎go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
1010
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
1111
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
1212
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
13+
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
1314
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
1415
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
1516
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -100,3 +101,5 @@ gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c=
100101
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
101102
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
102103
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
104+
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
105+
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=

‎mock/service/service.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ package service
22

33
import (
44
"fmt"
5-
"os"
65
"reflect"
76
"strings"
87
"sync"
98
"sync/atomic"
109

10+
"k8s.io/klog"
11+
1112
"github.com/container-storage-interface/spec/lib/go/csi"
1213
"github.com/kubernetes-csi/csi-test/v4/mock/cache"
1314
"golang.org/x/net/context"
@@ -132,8 +133,7 @@ func New(config Config) Service {
132133
s.hooksVm.Run(grpcJSCodes) // set global variables with gRPC error codes
133134
_, err := s.hooksVm.Run(s.config.ExecHooks.Globals)
134135
if err != nil {
135-
fmt.Printf("Error encountered in the global exec hook: %v. Exiting\n", err)
136-
os.Exit(1)
136+
klog.Exitf("Error encountered in the global exec hook: %v. Exiting\n", err)
137137
}
138138
}
139139
s.snapshots = cache.NewSnapshotCache()
@@ -277,8 +277,7 @@ func (s *service) execHook(hookName string) (codes.Code, string) {
277277
if len(script) > 0 {
278278
result, err := s.hooksVm.Run(script)
279279
if err != nil {
280-
fmt.Printf("Exec hook %s error: %v; exiting\n", hookName, err)
281-
os.Exit(1)
280+
klog.Exitf("Exec hook %s error: %v; exiting\n", hookName, err)
282281
}
283282
rv, err := result.ToInteger()
284283
if err == nil {

‎vendor/k8s.io/klog/.travis.yml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/klog/CONTRIBUTING.md

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)