Skip to content

Commit 4c1fcae

Browse files
authored
fix(scheduler): Prevent cron parse err from aborting compensation batch (#310)
1 parent 4a11572 commit 4c1fcae

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

‎echo/echo-scheduler/src/main/groovy/com/netflix/spinnaker/echo/scheduler/actions/pipeline/impl/MissedPipelineTriggerCompensationJob.groovy‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import rx.Observable
3636
import rx.Scheduler
3737
import rx.Subscription
3838

39+
import java.text.ParseException
3940
import java.time.Clock
4041
import java.time.Duration
4142
import java.time.Instant
@@ -197,11 +198,16 @@ class MissedPipelineTriggerCompensationJob implements ApplicationListener<Contex
197198
return
198199
}
199200

200-
def expr = new CronExpression(trigger.cronExpression)
201-
expr.timeZone = dateContext.timeZone
201+
try {
202+
CronExpression expr = new CronExpression(trigger.cronExpression)
203+
expr.timeZone = dateContext.timeZone
202204

203-
if (missedExecution(expr, lastExecution, dateContext.triggerWindowFloor, dateContext.now, pipeline)) {
204-
pipelineInitiator.call(pipeline)
205+
if (missedExecution(expr, lastExecution, dateContext.triggerWindowFloor, dateContext.now, pipeline)) {
206+
pipelineInitiator.call(pipeline)
207+
}
208+
} catch (ParseException e) {
209+
log.error("Error parsing cron expression (${trigger.cronExpression}) for pipeline ${pipeline.id}")
210+
registry.counter("orca.errors", "exception", error.getClass().getName()).increment()
205211
}
206212
}
207213
}

0 commit comments

Comments
 (0)