move logging after acquiring lock

SeldonIO · Oct 31, 2024 · bcd2fd5 · bcd2fd5
1 parent 213a341
commit bcd2fd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/scheduler/pkg/agent/server.go b/scheduler/pkg/agent/server.go
@@ -385,7 +385,6 @@ func (s *Server) ModelScalingTrigger(stream pb.AgentService_ModelScalingTriggerS
 
 func (s *Server) Subscribe(request *pb.AgentSubscribeRequest, stream pb.AgentService_SubscribeServer) error {
 	logger := s.logger.WithField("func", "Subscribe")
-	logger.Infof("Received subscribe request from %s:%d", request.ServerName, request.ReplicaIdx)
 	key := ServerKey{serverName: request.ServerName, replicaIdx: request.ReplicaIdx}
 
 	// this is forcing a serial order per agent (serverName, replicaIdx)
@@ -394,6 +393,8 @@ func (s *Server) Subscribe(request *pb.AgentSubscribeRequest, stream pb.AgentSer
 	mu.(*sync.Mutex).Lock()
 	defer mu.(*sync.Mutex).Unlock()
 
+	logger.Infof("Received subscribe request from %s:%d", request.ServerName, request.ReplicaIdx)
+
 	fin := make(chan bool)
 
 	s.mutex.Lock()

diff --git a/scheduler/pkg/kafka/dataflow/server.go b/scheduler/pkg/kafka/dataflow/server.go
@@ -127,7 +127,6 @@ func (c *ChainerServer) PipelineUpdateEvent(ctx context.Context, message *chaine
 
 func (c *ChainerServer) SubscribePipelineUpdates(req *chainer.PipelineSubscriptionRequest, stream chainer.Chainer_SubscribePipelineUpdatesServer) error {
 	logger := c.logger.WithField("func", "SubscribePipelineStatus")
-	logger.Infof("Received subscribe request from %s", req.GetName())
 
 	key := req.GetName()
 	// this is forcing a serial order per dataflow-engine
@@ -136,6 +135,8 @@ func (c *ChainerServer) SubscribePipelineUpdates(req *chainer.PipelineSubscripti
 	mu.(*sync.Mutex).Lock()
 	defer mu.(*sync.Mutex).Unlock()
 
+	logger.Infof("Received subscribe request from %s", req.GetName())
+
 	fin := make(chan bool)
 
 	c.mu.Lock()