Skip to content

Commit f09ea5c

Browse files
Fix errcheck in service/history (#3754)
1 parent 3292907 commit f09ea5c

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

service/history/queues/queue_base_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ func (s *queueBaseSuite) TestStartStop() {
295295

296296
s.mockRescheduler.EXPECT().Start().Times(1)
297297
base.Start()
298-
base.processNewRange()
298+
s.NoError(base.processNewRange())
299299

300300
<-doneCh
301301
<-base.checkpointTimer.C
@@ -344,7 +344,7 @@ func (s *queueBaseSuite) TestProcessNewRange() {
344344
)
345345
s.True(base.nonReadableScope.Range.Equals(NewRange(tasks.MinimumKey, tasks.MaximumKey)))
346346

347-
base.processNewRange()
347+
s.NoError(base.processNewRange())
348348
defaultReader, ok := base.readerGroup.ReaderByID(DefaultReaderId)
349349
s.True(ok)
350350
scopes := defaultReader.Scopes()

service/history/queues/queue_immediate.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ func (p *immediateQueue) processEventLoop() {
157157
case <-p.shutdownCh:
158158
return
159159
case <-p.notifyCh:
160-
p.processNewRange()
160+
if err := p.processNewRange(); err != nil {
161+
p.logger.Error("Unable to process new range", tag.Error(err))
162+
}
161163
case <-pollTimer.C:
162164
p.processPollTimer(pollTimer)
163165
case <-p.checkpointTimer.C:
@@ -169,7 +171,9 @@ func (p *immediateQueue) processEventLoop() {
169171
}
170172

171173
func (p *immediateQueue) processPollTimer(pollTimer *time.Timer) {
172-
p.processNewRange()
174+
if err := p.processNewRange(); err != nil {
175+
p.logger.Error("Unable to process new range", tag.Error(err))
176+
}
173177

174178
pollTimer.Reset(backoff.JitDuration(
175179
p.options.MaxPollInterval(),

service/history/workflowTaskHandlerCallbacks_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ func (s *WorkflowTaskHandlerCallbackSuite) TestVerifyFirstWorkflowTaskScheduled_
197197
}, "wType", "testTaskQueue", payloads.EncodeString("input"), 25*time.Second, 20*time.Second, 200*time.Second, "identity")
198198

199199
// zombie state should be treated as open
200-
ms.UpdateWorkflowStateStatus(
200+
s.NoError(ms.UpdateWorkflowStateStatus(
201201
enumsspb.WORKFLOW_EXECUTION_STATE_ZOMBIE,
202202
enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING,
203-
)
203+
))
204204
wfMs := workflow.TestCloneToProto(ms)
205205
gwmsResponse := &persistence.GetWorkflowExecutionResponse{State: wfMs}
206206
s.mockExecutionMgr.EXPECT().GetWorkflowExecution(gomock.Any(), gomock.Any()).Return(gwmsResponse, nil)

0 commit comments

Comments
 (0)