From 827368b8ae263129f74bcd50fcf1c380f685ca6e Mon Sep 17 00:00:00 2001 From: Michael Snowden Date: Mon, 19 Dec 2022 17:16:27 -0800 Subject: [PATCH] Fix errcheck in service/history --- service/history/queues/queue_base_test.go | 4 ++-- service/history/queues/queue_immediate.go | 8 ++++++-- service/history/workflowTaskHandlerCallbacks_test.go | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/service/history/queues/queue_base_test.go b/service/history/queues/queue_base_test.go index 5ae8b7fe41d..186b5967e46 100644 --- a/service/history/queues/queue_base_test.go +++ b/service/history/queues/queue_base_test.go @@ -295,7 +295,7 @@ func (s *queueBaseSuite) TestStartStop() { s.mockRescheduler.EXPECT().Start().Times(1) base.Start() - base.processNewRange() + s.NoError(base.processNewRange()) <-doneCh <-base.checkpointTimer.C @@ -344,7 +344,7 @@ func (s *queueBaseSuite) TestProcessNewRange() { ) s.True(base.nonReadableScope.Range.Equals(NewRange(tasks.MinimumKey, tasks.MaximumKey))) - base.processNewRange() + s.NoError(base.processNewRange()) defaultReader, ok := base.readerGroup.ReaderByID(DefaultReaderId) s.True(ok) scopes := defaultReader.Scopes() diff --git a/service/history/queues/queue_immediate.go b/service/history/queues/queue_immediate.go index 63d7429df12..cb4fe8bfdf6 100644 --- a/service/history/queues/queue_immediate.go +++ b/service/history/queues/queue_immediate.go @@ -157,7 +157,9 @@ func (p *immediateQueue) processEventLoop() { case <-p.shutdownCh: return case <-p.notifyCh: - p.processNewRange() + if err := p.processNewRange(); err != nil { + p.logger.Error("Unable to process new range", tag.Error(err)) + } case <-pollTimer.C: p.processPollTimer(pollTimer) case <-p.checkpointTimer.C: @@ -169,7 +171,9 @@ func (p *immediateQueue) processEventLoop() { } func (p *immediateQueue) processPollTimer(pollTimer *time.Timer) { - p.processNewRange() + if err := p.processNewRange(); err != nil { + p.logger.Error("Unable to process new range", tag.Error(err)) + } pollTimer.Reset(backoff.JitDuration( p.options.MaxPollInterval(), diff --git a/service/history/workflowTaskHandlerCallbacks_test.go b/service/history/workflowTaskHandlerCallbacks_test.go index 7266d0c3790..ddd6f2c3437 100644 --- a/service/history/workflowTaskHandlerCallbacks_test.go +++ b/service/history/workflowTaskHandlerCallbacks_test.go @@ -197,10 +197,10 @@ func (s *WorkflowTaskHandlerCallbackSuite) TestVerifyFirstWorkflowTaskScheduled_ }, "wType", "testTaskQueue", payloads.EncodeString("input"), 25*time.Second, 20*time.Second, 200*time.Second, "identity") // zombie state should be treated as open - ms.UpdateWorkflowStateStatus( + s.NoError(ms.UpdateWorkflowStateStatus( enumsspb.WORKFLOW_EXECUTION_STATE_ZOMBIE, enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING, - ) + )) wfMs := workflow.TestCloneToProto(ms) gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs} s.mockExecutionMgr.EXPECT().GetWorkflowExecution(gomock.Any(), gomock.Any()).Return(gwmsResponse, nil)