Skip to content

Commit 825d39c

Browse files
Fix errcheck in service/matching (#3756)
Add some more error-handling to service/matching
1 parent ba2d711 commit 825d39c

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

service/matching/matcher_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ func (t *MatcherTestSuite) TestQueryRemoteSyncMatch() {
277277
task.forwardedFrom = req.GetForwardedSource()
278278
close(pollSigC)
279279
time.Sleep(10 * time.Millisecond)
280-
t.rootMatcher.OfferQuery(ctx, task)
280+
_, err := t.rootMatcher.OfferQuery(ctx, task)
281+
t.Assert().NoError(err)
281282
},
282283
).Return(&matchingservice.QueryWorkflowResponse{QueryResult: payloads.EncodeString("answer")}, nil)
283284

@@ -386,7 +387,8 @@ func (t *MatcherTestSuite) TestMustOfferRemoteMatch() {
386387

387388
go func() {
388389
ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second)
389-
t.matcher.Poll(ctx)
390+
_, err := t.matcher.Poll(ctx)
391+
t.Assert().NoError(err)
390392
cancel()
391393
}()
392394

service/matching/service.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ func (s *Service) Stop() {
118118

119119
// remove self from membership ring and wait for traffic to drain
120120
s.logger.Info("ShutdownHandler: Evicting self from membership ring")
121-
s.membershipMonitor.EvictSelf()
121+
if err := s.membershipMonitor.EvictSelf(); err != nil {
122+
s.logger.Error("ShutdownHandler: Failed to evict self from membership ring", tag.Error(err))
123+
}
122124
s.healthServer.SetServingStatus(serviceName, healthpb.HealthCheckResponse_NOT_SERVING)
123125
s.logger.Info("ShutdownHandler: Waiting for others to discover I am unhealthy")
124126
time.Sleep(s.config.ShutdownDrainDuration())

service/matching/taskQueueManager.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,9 @@ func (c *taskQueueManagerImpl) Stop() {
308308
ctx, cancel := c.newIOContext()
309309
defer cancel()
310310

311-
c.db.UpdateState(ctx, ackLevel)
311+
if err := c.db.UpdateState(ctx, ackLevel); err != nil {
312+
c.logger.Error("Failed to update task queue state", tag.Error(err))
313+
}
312314
c.taskGC.RunNow(ctx, ackLevel)
313315
}
314316
c.metadataPoller.Stop()

service/matching/taskReader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Loop:
201201

202202
// only error here is due to context cancelation which we also
203203
// handle above
204-
tr.addTasksToBuffer(ctx, tasks)
204+
_ = tr.addTasksToBuffer(ctx, tasks)
205205
// There maybe more tasks. We yield now, but signal pump to check again later.
206206
tr.Signal()
207207

0 commit comments

Comments
 (0)