Merge pull request #140 from codenrhoden/fix-graceful-stop

Don't call grpc stop before server initialized
rexray · Mar 25, 2020 · 97feea8 · 97feea8
2 parents b980094 + 0545aaf
commit 97feea8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/gocsi.go b/gocsi.go
@@ -320,7 +320,9 @@ func (sp *StoragePlugin) Serve(ctx context.Context, lis net.Listener) error {
 // errors.
 func (sp *StoragePlugin) Stop(ctx context.Context) {
 	sp.stopOnce.Do(func() {
-		sp.server.Stop()
+		if sp.server != nil {
+			sp.server.Stop()
+		}
 		log.Info("stopped")
 	})
 }
@@ -330,7 +332,9 @@ func (sp *StoragePlugin) Stop(ctx context.Context) {
 // pending RPCs are finished.
 func (sp *StoragePlugin) GracefulStop(ctx context.Context) {
 	sp.stopOnce.Do(func() {
-		sp.server.GracefulStop()
+		if sp.server != nil {
+			sp.server.GracefulStop()
+		}
 		log.Info("gracefully stopped")
 	})
 }