nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1555: Initialize due of Cleanup Job based on firstRun (#1488) 

* TSK-1555: Initialize due of Cleanup Job based on firstRun

* TSK-1555: Improvements after review
This commit is contained in:
tge20 2021-03-02 10:34:30 +01:00 committed by GitHub
parent d57aeb3219
commit ec822c1168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java
View File

@ -15,6 +15,7 @@ import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
/** Abstract base for all background jobs of TASKANA. */
public abstract class AbstractTaskanaJob implements TaskanaJob {
protected final Instant firstRun;
protected final Duration runEvery;
protected TaskanaEngineImpl taskanaEngineImpl;
protected TaskanaTransactionProvider<Object> txProvider;
@ -27,6 +28,7 @@ public abstract class AbstractTaskanaJob implements TaskanaJob {
this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
this.txProvider = txProvider;
this.scheduledJob = job;
firstRun = taskanaEngine.getConfiguration().getCleanupJobFirstRun();
this.runEvery = taskanaEngineImpl.getConfiguration().getCleanupJobRunEvery();
}
@ -60,7 +62,7 @@ public abstract class AbstractTaskanaJob implements TaskanaJob {
}
protected Instant getNextDueForCleanupJob() {
Instant nextRun = Instant.now();
Instant nextRun = firstRun;
if (scheduledJob != null && scheduledJob.getDue() != null) {
nextRun = scheduledJob.getDue();
}

2
lib/taskana-core/src/main/java/pro/taskana/task/api/TaskService.java
View File

@ -160,7 +160,7 @@ public interface TaskService {
Task getTask(String taskId) throws TaskNotFoundException, NotAuthorizedException;
/**
* Transfer a task to another work basket. The transfer sets the transferred flag and resets the
* Transfer a Task to another work basket. The transfer sets the transferred flag and resets the
* read flag.
*
* @param taskId The id of the {@link Task} to be transferred

31
lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
View File

@ -179,18 +179,43 @@ class TaskCleanupJobAccTest extends AbstractAccTest {
jobService.createJob(scheduledJob);
jobsToRun = jobMapper.findJobsToRun(Instant.now());
assertThat(jobsToRun).hasSize(1);
assertThat(jobsToRun.get(0).getDue()).isEqualTo(firstDue);
assertThat(jobsToRun).extracting(ScheduledJob::getDue).containsExactly(firstDue);
JobRunner runner = new JobRunner(taskanaEngine);
runner.runJobs();
Duration runEvery = taskanaEngineConfiguration.getCleanupJobRunEvery();
jobsToRun = jobMapper.findJobsToRun(Instant.now().plus(runEvery));
assertThat(jobsToRun).hasSize(1);
assertThat(jobsToRun).extracting(ScheduledJob::getDue).containsExactly(firstDue.plus(runEvery));
}
@WithAccessId(user = "admin")
@Test
void should_ScheduleNextJobAccordingToFirstRun_When_PreviousJobNotExisting() throws Exception {
Instant firstRun = Instant.now().minus(2, ChronoUnit.MINUTES).truncatedTo(ChronoUnit.MILLIS);
Duration runEvery = Duration.ofMinutes(5);
taskanaEngineConfiguration.setCleanupJobRunEvery(runEvery);
taskanaEngineConfiguration.setCleanupJobFirstRun(firstRun);
TaskCleanupJob.initializeSchedule(taskanaEngine);
List<ScheduledJob> nextJobs = getJobMapper().findJobsToRun(Instant.now().plus(runEvery));
assertThat(nextJobs).extracting(ScheduledJob::getDue).containsExactly(firstRun.plus(runEvery));
}
@WithAccessId(user = "admin")
@Test
void should_FindNoJobsToRunUntilFirstRunIsReached_When_CleanupScheduleIsInitialized()
throws Exception {
taskanaEngineConfiguration.setCleanupJobRunEvery(Duration.ZERO);
taskanaEngineConfiguration.setCleanupJobFirstRun(Instant.now().plus(5, ChronoUnit.MINUTES));
TaskCleanupJob.initializeSchedule(taskanaEngine);
List<ScheduledJob> nextJobs = getJobMapper().findJobsToRun(Instant.now());
assertThat(nextJobs).isEmpty();
}
private String createAndInsertTask(String parentBusinessProcessId) throws Exception {
Task newTask = taskService.newTask("user-1-1", "DOMAIN_A");
newTask.setClassificationKey("T2100");