Merge pull request #17 from msau42/set-node-server

k8s-ci-robot · web-flow · commit 48ce196cd8ff · 2019-08-15T09:06:35.000-07:00
Correctly set node server in nfs plugin object
diff --git a/pkg/nfs/nfs.go b/pkg/nfs/nfs.go
@@ -68,13 +68,14 @@ func NewNodeServer(n *nfsDriver) *nodeServer {
 }
 
 func (n *nfsDriver) Run() {
+	n.ns = NewNodeServer(n)
 	s := NewNonBlockingGRPCServer()
 	s.Start(n.endpoint,
 		NewDefaultIdentityServer(n),
 		// NFS plugin has not implemented ControllerServer
 		// using default controllerserver.
 		NewControllerServer(n),
-		NewNodeServer(n))
+		n.ns)
 	s.Wait()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,14 @@ func NewNodeServer(n nfsDriver) nodeServer {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func (n *nfsDriver) Run() {`
	`71`	`+ n.ns = NewNodeServer(n)`
`71`	`72`	`s := NewNonBlockingGRPCServer()`
`72`	`73`	`s.Start(n.endpoint,`
`73`	`74`	`NewDefaultIdentityServer(n),`
`74`	`75`	`// NFS plugin has not implemented ControllerServer`
`75`	`76`	`// using default controllerserver.`
`76`	`77`	`NewControllerServer(n),`
`77`		`- NewNodeServer(n))`
	`78`	`+ n.ns)`
`78`	`79`	`s.Wait()`
`79`	`80`	`}`
`80`	`81`