fix timeout

ihaolin · Aug 10, 2017 · 489af2f · 489af2f
1 parent e453264
commit 489af2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/antares-demo/src/main/java/me/hao0/antares/demo/jobs/DemoJobA.java b/antares-demo/src/main/java/me/hao0/antares/demo/jobs/DemoJobA.java
@@ -21,7 +21,7 @@ public JobResult execute(JobContext context) {
         System.out.println("DemoJobA start...");
         System.out.println("context: " + context);
 
-        Sleeps.sleep(random.nextInt(5) + 1);
+        Sleeps.sleep(random.nextInt(10) + 1);
 
         System.out.println("DemoJobA end...");
 

diff --git a/antares-demo/src/main/resources/antares-context.xml b/antares-demo/src/main/resources/antares-context.xml
@@ -14,10 +14,11 @@
 
 	<!-- Spring Antares Client -->
 	<bean class="me.hao0.antares.client.core.SpringAntaresClient">
-		<constructor-arg index="0" value="demo_app" />
+		<constructor-arg index="0" value="myapp" />
 		<constructor-arg index="1" value="123456" />
-		<constructor-arg index="2" value="${antares.zk}" />
-		<property name="executorThreadCount" value="32" />
+		<constructor-arg index="2" value="localhost:2181" />
+		<constructor-arg index="3" value="ats" />
+		<property name="executorThreadCount" value="8" />
 	</bean>
 
 </beans>
diff --git a/...res-server/src/main/java/me/hao0/antares/server/schedule/executor/DefaultJobExecutor.java b/...res-server/src/main/java/me/hao0/antares/server/schedule/executor/DefaultJobExecutor.java
@@ -87,7 +87,7 @@ public void execute(final JobDetail jobDetail, JobTriggerType triggerType, JobEx
             // blocking until all shards to be finished or timeout
             Long timeout = jobDetail.getConfig().getTimeout();
             timeout = timeout == null ? 0L : timeout;
-            JobInstanceWaitResp finishResp = jobSupport.waitingJobInstanceFinish(appName, jobClass, timeout, instance.getId());
+            JobInstanceWaitResp finishResp = jobSupport.waitingJobInstanceFinish(appName, jobClass, instance.getId(), timeout);
             if (finishResp.isSuccess()){
                 // job instance is finished successfully
                 // publish job finish event