Address test races caused by deferred logs (#6841)

Author: taylanisikdemir

Diff for: service/history/queue/timer_queue_processor.go

@@ -412,11 +412,11 @@ func (t *timerQueueProcessor) drain() {
 }
 
 func (t *timerQueueProcessor) completeTimerLoop() {
+	defer t.shutdownWG.Done()
+
 	t.logger.Info("Timer queue processor completeTimerLoop")
 	defer t.logger.Info("Timer queue processor completeTimerLoop completed")
 
-	defer t.shutdownWG.Done()
-
 	completeTimer := time.NewTimer(t.config.TimerProcessorCompleteTimerInterval())
 	defer completeTimer.Stop()
 

Diff for: service/history/queue/timer_queue_processor_base.go

@@ -185,7 +185,6 @@ func (t *timerQueueProcessorBase) Stop() {
 	}
 
 	t.logger.Info("Timer queue processor state changed", tag.LifeCycleStopping)
-	defer t.logger.Info("Timer queue processor state changed", tag.LifeCycleStopped)
 
 	t.timerGate.Stop()
 	close(t.shutdownCh)
@@ -200,6 +199,7 @@ func (t *timerQueueProcessorBase) Stop() {
 	}
 
 	t.redispatcher.Stop()
+	t.logger.Info("Timer queue processor state changed", tag.LifeCycleStopped)
 }
 
 func (t *timerQueueProcessorBase) processorPump() {

Diff for: service/history/queue/transfer_queue_processor.go

@@ -370,11 +370,11 @@ func (t *transferQueueProcessor) drain() {
 }
 
 func (t *transferQueueProcessor) completeTransferLoop() {
+	defer t.shutdownWG.Done()
+
 	t.logger.Info("Transfer queue processor completeTransferLoop")
 	defer t.logger.Info("Transfer queue processor completeTransferLoop completed")
 
-	defer t.shutdownWG.Done()
-
 	completeTimer := time.NewTimer(t.config.TransferProcessorCompleteTransferInterval())
 	defer completeTimer.Stop()
 

Diff for: service/history/queue/transfer_queue_processor_base.go

@@ -184,7 +184,6 @@ func (t *transferQueueProcessorBase) Stop() {
 	}
 
 	t.logger.Info("Transfer queue processor state changed", tag.LifeCycleStopping)
-	defer t.logger.Info("Transfer queue processor state changed", tag.LifeCycleStopped)
 
 	close(t.shutdownCh)
 	if t.startJitterTimer != nil {
@@ -204,6 +203,7 @@ func (t *transferQueueProcessorBase) Stop() {
 	}
 
 	t.redispatcher.Stop()
+	t.logger.Info("Transfer queue processor state changed", tag.LifeCycleStopped)
 }
 
 func (t *transferQueueProcessorBase) notifyNewTask(info *hcommon.NotifyTaskInfo) {