fix unit test for job timeout

Author: Yang Guo

config/app-api.properties

@@ -29,8 +29,8 @@ system.email = [email protected]
 system.username = admin
 system.password = 123456
 
-task.job.toggle.execution_timeout = false
-## 6s expire job
-task.job.toggle.execution_create_session_duration = 600
-## 1h expire job
+task.job.toggle.execution_timeout = true
+## expired in 1800 seconds for create session
+task.job.toggle.execution_create_session_duration = 1800
+## expired in 3600 seconds for job running
 task.job.toggle.execution_running_duration = 3600

platform-api/src/main/java/com/flow/platform/api/service/job/JobServiceImpl.java

@@ -662,14 +662,14 @@ public void checkTimeoutTask() {
 
         LOGGER.trace("job timeout task start");
 
-        // create session job timeout 6s time out
+        // job timeout on create session
         ZonedDateTime finishZoneDateTime = ZonedDateTime.now().minusSeconds(jobExecuteTimeoutCreateSessionDuration);
         List<Job> jobs = jobDao.listForExpired(finishZoneDateTime, JobStatus.SESSION_CREATING);
         for (Job job : jobs) {
             updateJobAndNodeResultTimeout(job);
         }
 
-        // running job timeout 1h time out
+        // job timeout on running
         ZonedDateTime finishRunningZoneDateTime = ZonedDateTime.now().minusSeconds(jobExecuteTimeoutRunningDuration);
         List<Job> runningJobs = jobDao.listForExpired(finishRunningZoneDateTime, JobStatus.RUNNING);
         for (Job job : runningJobs) {

platform-api/src/main/resources/app-default.properties

@@ -29,9 +29,9 @@ system.email = [email protected]
 system.username = admin
 system.password = 123456
 
-task.job.toggle.execution_timeout = false
-## 6s expire job
-task.job.toggle.execution_create_session_duration = 600
-## 1h expire job
+task.job.toggle.execution_timeout = true
+## expired in 1800 seconds for job create session
+task.job.toggle.execution_create_session_duration = 1800
+## expired in 3600 seconds for running job
 task.job.toggle.execution_running_duration = 3600
 

platform-api/src/test/java/com/flow/platform/api/test/service/JobServiceTest.java

@@ -32,6 +32,7 @@
 import com.flow.platform.api.test.TestBase;
 import com.flow.platform.api.util.CommonUtil;
 import com.flow.platform.core.exception.IllegalStatusException;
+import com.flow.platform.core.util.ThreadUtil;
 import com.flow.platform.domain.Cmd;
 import com.flow.platform.domain.CmdResult;
 import com.flow.platform.domain.CmdStatus;
@@ -260,19 +261,16 @@ public void should_stop_running_job_success() throws IOException {
         Assert.assertEquals(NodeStatus.STOPPED, stoppedJob.getRootResult().getStatus());
     }
 
-
     @Test
     public void should_job_time_out_and_reject_callback() throws IOException, InterruptedException {
+        // given: job and mock updated time as expired
         Node rootForFlow = createRootFlow("flow1", "demo_flow2.yaml");
-
         Job job = jobService.createFromFlowYml(rootForFlow.getPath(), JobCategory.TAG, null, mockUser);
-
         Assert.assertNotNull(job.getEnv("FLOW_WORKSPACE"));
         Assert.assertNotNull(job.getEnv("FLOW_VERSION"));
 
-        Thread.sleep(7000);
-
         // when: check job timeout
+        ThreadUtil.sleep(20000);
         jobService.checkTimeoutTask();
 
         // then: job status should be timeout