correct some minor nitpicks (#16192)

istio · Aug 21, 2019 · 18da209 · 18da209
1 parent 56c06b1
commit 18da209
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/security/cmd/node_agent_k8s/main.go b/security/cmd/node_agent_k8s/main.go
@@ -160,11 +160,11 @@ var (
 			}
 
 			server, err := sds.NewServer(serverOptions, workloadSecretCache, gatewaySecretCache)
-			defer server.Stop()
 			if err != nil {
 				log.Errorf("failed to create sds service: %v", err)
 				return fmt.Errorf("failed to create sds service")
 			}
+			defer server.Stop()
 
 			monitorErrCh := make(chan error)
 			// Start the monitoring server.

diff --git a/security/pkg/nodeagent/sds/server.go b/security/pkg/nodeagent/sds/server.go
@@ -225,14 +225,24 @@ func (s *Server) initWorkloadSdsService(options *Options) error { //nolint: unpa
 	go func() {
 		sdsServiceLog.Info("Start SDS grpc server")
 		waitTime := time.Second
+
 		for i := 0; i < maxRetryTimes; i++ {
-			// Retry if Serve() fails
-			if err = s.grpcWorkloadServer.Serve(s.grpcWorkloadListener); err != nil {
-				sdsServiceLog.Errorf("SDS grpc server for workload proxies failed to start: %v", err)
+			serverOk := true
+			setUpUdsOK := true
+			if s.grpcWorkloadListener != nil {
+				if err = s.grpcWorkloadServer.Serve(s.grpcWorkloadListener); err != nil {
+					sdsServiceLog.Errorf("SDS grpc server for workload proxies failed to start: %v", err)
+					serverOk = false
+				}
+			}
+			if s.grpcWorkloadListener == nil {
+				if s.grpcWorkloadListener, err = setUpUds(options.WorkloadUDSPath); err != nil {
+					sdsServiceLog.Errorf("SDS grpc server for workload proxies failed to set up UDS: %v", err)
+					setUpUdsOK = false
+				}
 			}
-			s.grpcWorkloadListener, err = setUpUds(options.WorkloadUDSPath)
-			if err != nil {
-				sdsServiceLog.Errorf("SDS grpc server for workload proxies failed to set up UDS: %v", err)
+			if serverOk && setUpUdsOK {
+				break
 			}
 			time.Sleep(waitTime)
 			waitTime *= 2
@@ -256,14 +266,24 @@ func (s *Server) initGatewaySdsService(options *Options) error {
 	go func() {
 		sdsServiceLog.Info("Start SDS grpc server for ingress gateway proxy")
 		waitTime := time.Second
+
 		for i := 0; i < maxRetryTimes; i++ {
-			// Retry if Serve() fails
-			if err = s.grpcGatewayServer.Serve(s.grpcGatewayListener); err != nil {
-				sdsServiceLog.Errorf("SDS grpc server for ingress gateway proxy failed to start: %v", err)
+			serverOk := true
+			setUpUdsOK := true
+			if s.grpcGatewayListener != nil {
+				if err = s.grpcGatewayServer.Serve(s.grpcGatewayListener); err != nil {
+					sdsServiceLog.Errorf("SDS grpc server for ingress gateway proxy failed to start: %v", err)
+					serverOk = false
+				}
+			}
+			if s.grpcGatewayListener == nil {
+				if s.grpcGatewayListener, err = setUpUds(options.IngressGatewayUDSPath); err != nil {
+					sdsServiceLog.Errorf("SDS grpc server for ingress gateway proxy failed to set up UDS: %v", err)
+					setUpUdsOK = false
+				}
 			}
-			s.grpcGatewayListener, err = setUpUds(options.IngressGatewayUDSPath)
-			if err != nil {
-				sdsServiceLog.Errorf("SDS grpc server for ingress gateway proxy failed to set up UDS: %v", err)
+			if serverOk && setUpUdsOK {
+				break
 			}
 			time.Sleep(waitTime)
 			waitTime *= 2