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: time out of range #409

Merged
merged 3 commits into from
Jul 11, 2023
Merged

fix: time out of range #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb86a6
fix: time out of range
fudongyingluck Jun 30, 2023
6defabc
fix: deschedule failed after schedule exception
fudongyingluck Jul 3, 2023
c7fadee
chore: dbwiddis's comments
fudongyingluck Jul 10, 2023
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
22 changes: 15 additions & 7 deletions src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,10 @@ public boolean deschedule(String indexName, String id) {
jobInfo.setExpectedPreviousExecutionTime(null);
Scheduler.ScheduledCancellable scheduledCancellable = jobInfo.getScheduledCancellable();

if (scheduledCancellable != null) {
if (scheduledCancellable.cancel()) {
this.scheduledJobInfo.removeJob(indexName, id);
} else {
return false;
}
if (scheduledCancellable != null && !scheduledCancellable.cancel()) {
return false;
}
this.scheduledJobInfo.removeJob(indexName, id);

return true;
}
Expand All @@ -148,7 +145,18 @@ boolean reschedule(
log.info("No next execution time for job {}", jobParameter.getName());
return true;
}
Duration duration = Duration.between(this.clock.instant(), nextExecutionTime);
Instant now = this.clock.instant();
Duration duration = Duration.between(now, nextExecutionTime);
if (duration.isNegative()) {
log.info(
"job {} expected time: {} < current time: {}, setting next execute time to current",
jobParameter.getName(),
nextExecutionTime.toEpochMilli(),
now.toEpochMilli()
);
nextExecutionTime = now;
duration = Duration.ZERO;
}

// Too many jobs start at the same time point will bring burst. Add random jitter delay to spread out load.
// Example, if interval is 10 minutes, jitter is 0.6, next job run will be randomly delayed by 0 to 10*0.6 minutes.
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/org/opensearch/jobscheduler/scheduler/JobSchedulerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,33 @@ public void testReschedule_noEnableTime() {
Assert.assertFalse(this.scheduler.reschedule(jobParameter, null, null, dummyVersion, jitterLimit));
}

public void testReschedule_outOfExpectTime() {
Schedule schedule = Mockito.mock(Schedule.class);
ScheduledJobParameter jobParameter = buildScheduledJobParameter(
"job-id",
"dummy job name",
Instant.now().minus(1, ChronoUnit.HOURS),
Instant.now(),
schedule,
false,
0.6
);
JobSchedulingInfo jobSchedulingInfo = new JobSchedulingInfo("job-index", "job-id", jobParameter);
Instant now = Instant.now();
jobSchedulingInfo.setDescheduled(false);

Mockito.when(schedule.getNextExecutionTime(Mockito.any()))
.thenReturn(now.minus(10, ChronoUnit.MINUTES))
.thenReturn(now.plus(2, ChronoUnit.MINUTES));

Scheduler.ScheduledCancellable cancellable = Mockito.mock(Scheduler.ScheduledCancellable.class);
Mockito.when(this.threadPool.schedule(Mockito.any(), Mockito.any(), Mockito.anyString())).thenReturn(cancellable);

Assert.assertTrue(this.scheduler.reschedule(jobParameter, jobSchedulingInfo, null, dummyVersion, jitterLimit));
Assert.assertEquals(cancellable, jobSchedulingInfo.getScheduledCancellable());
Mockito.verify(this.threadPool).schedule(Mockito.any(), Mockito.any(), Mockito.anyString());
}

public void testReschedule_jobDescheduled() {
Schedule schedule = Mockito.mock(Schedule.class);
ScheduledJobParameter jobParameter = buildScheduledJobParameter(
Expand Down