Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix skip logic yearly period bug #869

Open
wants to merge 2 commits into
base: releasing-2.5
Choose a base branch
from
Open

Fix skip logic yearly period bug #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9529c6
Fix skip logic bug
rrusso2007 Jan 19, 2018
71b4590
Add test to prove bug and verify
rrusso2007 Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/org/apache/mesos/chronos/scheduler/jobs/JobUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ object JobUtils {
protected def calculateSkips(dateTime: DateTime, jobStart: DateTime, period: Period): Int = {
// If the period is at least a month, we have to actually add the period to the date
// until it's in the future because a month-long period might have different seconds
if (period.getMonths >= 1) {
if (period.getMonths >= 1 || period.getYears >= 1) {
var skips = 0
var newDate = new DateTime(jobStart)
while (newDate.isBefore(dateTime)) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/scala/org/apache/mesos/chronos/scheduler/jobs/JobUtilsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,20 @@ class JobUtilsSpec extends SpecificationWithJUnit with Mockito {
scheduledTime.dayOfMonth().get must_== 1
}

"Can skip forward a job with a yearly period" in {
val schedule = s"R/2012-01-01T00:00:01.000Z/P1Y"
val job = new ScheduleBasedJob(schedule, "sample-name", "sample-command")
val now = new DateTime()

// Get the schedule stream, which should have been skipped forward
val stream = JobUtils.skipForward(job, now)
val scheduledTime = Iso8601Expressions.parse(stream.get.schedule, job.scheduleTimeZone).get._2

// Ensure that this job runs on the first of next month
scheduledTime.isAfter(now) must beTrue
scheduledTime.dayOfMonth().get must_== 1
}

"Can get job with arguments" in {
val schedule = "R/2012-01-01T00:00:01.000Z/P1M"
val arguments = "--help"
Expand Down