From dddf24107f454888a7d86f5d95fe40ccd8dd8077 Mon Sep 17 00:00:00 2001
From: Gaius <gaius.qi@gmail.com>
Date: Thu, 19 Aug 2021 14:47:38 +0800
Subject: [PATCH] feat: optimize manager startup process (#562)

* feat: optimize manager startup process
Signed-off-by: Gaius <gaius.qi@gmail.com>
---
 manager/manager.go     | 83 +++++++++++++++++++++++-------------------
 manager/proxy/proxy.go |  1 +
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/manager/manager.go b/manager/manager.go
index 3d9d988f523..3fd8fb25c13 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -39,8 +39,8 @@ type Server struct {
 	// Server configuration
 	config *config.Config
 
-	// GRPC service
-	service *service.GRPC
+	// GRPC server
+	grpcServer *grpc.Server
 
 	// REST server
 	restServer *http.Server
@@ -74,62 +74,65 @@ func New(cfg *config.Config) (*Server, error) {
 		return nil, err
 	}
 
-	// Initialize REST service
-	restService := service.NewREST(db, cache, job, enforcer)
-
-	// Initialize GRPC service
-	grpcService := service.NewGRPC(db, cache, searcher)
-
-	// Initialize Proxy service
+	// Initialize Proxy server
 	proxyServer := proxy.New(cfg.Database.Redis)
 
-	// Initialize router
+	// Initialize REST server
+	restService := service.NewREST(db, cache, job, enforcer)
 	router, err := router.Init(cfg.Verbose, cfg.Server.PublicPath, restService, enforcer)
 	if err != nil {
 		return nil, err
 	}
+	restServer := &http.Server{
+		Addr:    cfg.Server.REST.Addr,
+		Handler: router,
+	}
+
+	// Initialize GRPC server
+	grpcService := service.NewGRPC(db, cache, searcher)
+	grpcServer := grpc.NewServer()
+	manager.RegisterManagerServer(grpcServer, grpcService)
 
 	return &Server{
-		config:  cfg,
-		service: grpcService,
-		restServer: &http.Server{
-			Addr:    cfg.Server.REST.Addr,
-			Handler: router,
-		},
+		config:      cfg,
+		grpcServer:  grpcServer,
+		restServer:  restServer,
 		proxyServer: proxyServer,
 	}, nil
 }
 
 func (s *Server) Serve() error {
-	// GRPC listener
-	lis, _, err := rpc.ListenWithPortRange(s.config.Server.GRPC.Listen, s.config.Server.GRPC.PortRange.Start, s.config.Server.GRPC.PortRange.End)
-	if err != nil {
-		logger.Fatalf("failed to net listen: %+v", err)
-	}
-	defer lis.Close()
-
-	// Serve Proxy
+	// Started Proxy server
 	go func() {
-		logger.Info("serve proxy")
+		logger.Info("started proxy")
 		if err := s.proxyServer.Serve(); err != nil {
-			logger.Fatalf("failed to start manager proxy server: %+v", err)
+			logger.Fatalf("proxy server closed unexpect: %+v", err)
 		}
 	}()
 
-	// Serve REST
+	// Started REST server
 	go func() {
-		logger.Infof("serve rest at %s", s.restServer.Addr)
+		logger.Infof("started rest server at %s", s.restServer.Addr)
 		if err := s.restServer.ListenAndServe(); err != nil {
-			logger.Fatalf("failed to start manager rest server: %+v", err)
+			if err == http.ErrServerClosed {
+				logger.Info("rest server closed under request")
+				return
+			}
+			logger.Fatalf("rest server closed unexpect: %+v", err)
 		}
 	}()
 
-	// Serve GRPC
-	grpcServer := grpc.NewServer()
-	manager.RegisterManagerServer(grpcServer, s.service)
-	logger.Infof("serve grpc at %s://%s", lis.Addr().Network(), lis.Addr().String())
-	if err := grpcServer.Serve(lis); err != nil {
-		logger.Errorf("failed to start manager grpc server: %+v", err)
+	// Generate GRPC listener
+	lis, _, err := rpc.ListenWithPortRange(s.config.Server.GRPC.Listen, s.config.Server.GRPC.PortRange.Start, s.config.Server.GRPC.PortRange.End)
+	if err != nil {
+		logger.Fatalf("net listener failed to start: %+v", err)
+	}
+	defer lis.Close()
+
+	// Started GRPC server
+	logger.Infof("started grpc server at %s://%s", lis.Addr().Network(), lis.Addr().String())
+	if err := s.grpcServer.Serve(lis); err != nil {
+		logger.Errorf("stoped grpc server: %+v", err)
 		return err
 	}
 
@@ -137,11 +140,15 @@ func (s *Server) Serve() error {
 }
 
 func (s *Server) Stop() {
-	// Stop Proxy
+	// Stop Proxy server
 	s.proxyServer.Stop()
 
-	// Stop REST
+	// Stop REST server
 	if err := s.restServer.Shutdown(context.TODO()); err != nil {
-		logger.Errorf("failed to stop manager rest server: %+v", err)
+		logger.Errorf("rest server failed to stop: %+v", err)
 	}
+
+	// Stop GRPC server
+	s.grpcServer.GracefulStop()
+	logger.Info("grpc server closed under request")
 }
diff --git a/manager/proxy/proxy.go b/manager/proxy/proxy.go
index 0e117bc7c52..8b64a836a77 100644
--- a/manager/proxy/proxy.go
+++ b/manager/proxy/proxy.go
@@ -50,6 +50,7 @@ func (p *proxy) Serve() error {
 	if err != nil {
 		return err
 	}
+	defer listener.Close()
 
 	for {
 		select {