ensure Service Start is blocking

temporalio · Jul 5, 2023 · 593ed05 · 593ed05
1 parent 6b98c3e
commit 593ed05
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/service/frontend/service.go b/service/frontend/service.go
@@ -350,15 +350,12 @@ func (s *Service) Start() {
 	s.operatorHandler.Start()
 	s.handler.Start()
 
-	go func() {
-		logger.Info("Starting to serve on frontend listener")
-		if err := s.server.Serve(s.grpcListener); err != nil {
-			logger.Fatal("Failed to serve on frontend listener", tag.Error(err))
-		}
-	}()
-
-	s.membershipMonitor.Start()
-	logger.Info("frontend started")
+	go s.membershipMonitor.Start()
+
+	logger.Info("Starting to serve on frontend listener")
+	if err := s.server.Serve(s.grpcListener); err != nil {
+		logger.Fatal("Failed to serve on frontend listener", tag.Error(err))
+	}
 }
 
 // Stop stops the service

diff --git a/service/history/service.go b/service/history/service.go
@@ -109,15 +109,16 @@ func (s *Service) Start() {
 	healthpb.RegisterHealthServer(s.server, s.healthServer)
 	s.healthServer.SetServingStatus(serviceName, healthpb.HealthCheckResponse_SERVING)
 
-	go func() {
-		logger.Info("Starting to serve on history listener")
-		if err := s.server.Serve(s.grpcListener); err != nil {
-			logger.Fatal("Failed to serve on history listener", tag.Error(err))
-		}
-	}()
-
-	s.membershipMonitor.Start()
-	logger.Info("history started")
+	// As soon as we join membership, other hosts will send requests for shards
+	// that we own. Ideally, then, we would start the GRPC server, and only then
+	// join membership. That's not possible with the GRPC interface, though, hence
+	// we start membership in a goroutine.
+	go s.membershipMonitor.Start()
+
+	logger.Info("Starting to serve on history listener")
+	if err := s.server.Serve(s.grpcListener); err != nil {
+		logger.Fatal("Failed to serve on history listener", tag.Error(err))
+	}
 }
 
 // Stop stops the service

diff --git a/service/matching/service.go b/service/matching/service.go
@@ -108,15 +108,12 @@ func (s *Service) Start() {
 	healthpb.RegisterHealthServer(s.server, s.healthServer)
 	s.healthServer.SetServingStatus(serviceName, healthpb.HealthCheckResponse_SERVING)
 
-	go func() {
-		s.logger.Info("Starting to serve on matching listener")
-		if err := s.server.Serve(s.grpcListener); err != nil {
-			s.logger.Fatal("Failed to serve on matching listener", tag.Error(err))
-		}
-	}()
-
-	s.membershipMonitor.Start()
-	s.logger.Info("matching started")
+	go s.membershipMonitor.Start()
+
+	s.logger.Info("Starting to serve on matching listener")
+	if err := s.server.Serve(s.grpcListener); err != nil {
+		s.logger.Fatal("Failed to serve on matching listener", tag.Error(err))
+	}
 }
 
 // Stop stops the service