Skip to content

Commit

Permalink
fix(scheduler): recover from unhandled job panics (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
reugn committed Apr 20, 2024
1 parent 220db57 commit ecdc425
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
7 changes: 7 additions & 0 deletions quartz/scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,13 @@ func (sched *StdScheduler) executeAndReschedule(ctx context.Context) {
}

func executeWithRetries(ctx context.Context, jobDetail *JobDetail) {
// recover from unhandled panics that may occur during job execution
defer func() {
if err := recover(); err != nil {
logger.Errorf("Job %s panicked: %s", jobDetail.jobKey, err)
}
}()

err := jobDetail.job.Execute(ctx)
if err == nil {
return
Expand Down
26 changes: 26 additions & 0 deletions quartz/scheduler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,32 @@ func TestScheduler_MisfiredJob(t *testing.T) {
sched.Stop()
}

func TestScheduler_JobPanic(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 35*time.Millisecond)
defer cancel()

var n int32
addJob := job.NewFunctionJob(func(_ context.Context) (int32, error) {
return atomic.AddInt32(&n, 1), nil
})
panicJob := job.NewFunctionJob(func(_ context.Context) (int32, error) {
panic("error")
})

sched := quartz.NewStdScheduler()
sched.Start(ctx)

addJobDetail := quartz.NewJobDetail(addJob, quartz.NewJobKey("addJob"))
err := sched.ScheduleJob(addJobDetail, quartz.NewSimpleTrigger(10*time.Millisecond))
assert.IsNil(t, err)
panicJobDetail := quartz.NewJobDetail(panicJob, quartz.NewJobKey("panicJob"))
err = sched.ScheduleJob(panicJobDetail, quartz.NewSimpleTrigger(15*time.Millisecond))
assert.IsNil(t, err)

sched.Wait(ctx)
assert.Equal(t, int(atomic.LoadInt32(&n)), 3)
}

func TestScheduler_PauseResume(t *testing.T) {
var n int32
funcJob := job.NewFunctionJob(func(_ context.Context) (string, error) {
Expand Down

0 comments on commit ecdc425

Please sign in to comment.