fix(timer): one timer job failed should not block anothers

bytedance · Apr 22, 2024 · ff4a6b8 · ff4a6b8
1 parent b05f17f
commit ff4a6b8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/d_timer/sql/timer.go b/d_timer/sql/timer.go
@@ -125,13 +125,13 @@ func (t *DBTimer) handleJobs(ctx context.Context) error {
 			if err := tx.Clauses(clause.Locking{Strength: "UPDATE", Options: "NOWAIT"}).Where(
 				"service = ? and next_time <= ? and status = ? and id = ?", t.service, time.Now(), TimerToRun, job.ID,
 			).First(&job).Error; err != nil {
-				t.logger.V(logger.LevelDebug).Info("lock job failed", "jobID", job.ID, "err", err)
+				t.logger.V(logger.LevelDebug).Info("lock timer job failed", "jobID", job.ID, "err", err)
 				// continue
 				return nil
 			}
 
 			if err := t.cb(ctx, job.Key, job.Cron, job.Payload); err != nil {
-				t.logger.Error(err, "timer callback failed")
+				t.logger.Error(err, "timer job callback failed", "jobID", job.ID)
 			}
 			if err := job.Next(); err != nil {
 				job.Close(err)
@@ -144,7 +144,9 @@ func (t *DBTimer) handleJobs(ctx context.Context) error {
 
 			return nil
 		}); err != nil {
-			return err
+			// 只可能在保存Job和提交事务时发生
+			t.logger.Error(err, "save timer job failed", "jobID", job.ID)
+			continue
 		}
 	}