From d7a4d6441de5863418026a183baa449e27ab2734 Mon Sep 17 00:00:00 2001 From: Tienan Chen Date: Mon, 4 Nov 2013 17:28:09 +0800 Subject: [PATCH] refactor, and move judging the script isFinish method to ExecuteOverTask --- .../org/bench4q/master/api/AgentController.java | 11 ----------- .../master/api/model/RunningScriptModel.java | 10 ++++++++++ .../master/testPlan/TestPlanContainer.java | 16 ---------------- .../bench4q/master/testPlan/TestPlanContext.java | 1 - .../highavailable/HighAvailablePool.java | 1 - .../testPlan/loadcommand/ScriptLoadBase.java | 1 + .../schedulscript/ExecutionOverTask.java | 1 + 7 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/bench4q/master/api/AgentController.java b/src/main/java/org/bench4q/master/api/AgentController.java index 52627a53..9e24a7a0 100644 --- a/src/main/java/org/bench4q/master/api/AgentController.java +++ b/src/main/java/org/bench4q/master/api/AgentController.java @@ -7,7 +7,6 @@ import org.bench4q.master.communication.AgentStateService; import org.bench4q.master.entity.db.Agent; import org.bench4q.master.service.AgentService; import org.bench4q.master.service.UserService; -import org.bench4q.master.testPlan.highavailable.HighAvailablePool; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.ResponseBody; public class AgentController extends BaseController { private AgentService agentPoolService; private AgentStateService agentStateService; - private HighAvailablePool highAvailablePool; public AgentStateService getAgentStateService() { return agentStateService; @@ -41,15 +39,6 @@ public class AgentController extends BaseController { this.agentPoolService = agentPoolService; } - public HighAvailablePool getHighAvailablePool() { - return highAvailablePool; - } - - @Autowired - public void setHighAvailablePool(HighAvailablePool highAvailablePool) { - this.highAvailablePool = highAvailablePool; - } - @RequestMapping(value = "/addAgentToPool", method = RequestMethod.POST) @ResponseBody public AgentResponseModel addAgentToPool(@RequestBody Agent agent) { diff --git a/src/main/java/org/bench4q/master/api/model/RunningScriptModel.java b/src/main/java/org/bench4q/master/api/model/RunningScriptModel.java index 42e719cf..1ea320de 100644 --- a/src/main/java/org/bench4q/master/api/model/RunningScriptModel.java +++ b/src/main/java/org/bench4q/master/api/model/RunningScriptModel.java @@ -2,6 +2,7 @@ package org.bench4q.master.api.model; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; @@ -14,6 +15,7 @@ public class RunningScriptModel { private TestScriptConfig config; private boolean finish; private List runningAgents = new ArrayList(); + private UUID testPlanID; @XmlElement public int getScriptId() { @@ -61,4 +63,12 @@ public class RunningScriptModel { this.runningAgents = runningAgents; } + public UUID getTestPlanID() { + return testPlanID; + } + + public void setTestPlanID(UUID testPlanID) { + this.testPlanID = testPlanID; + } + } diff --git a/src/main/java/org/bench4q/master/testPlan/TestPlanContainer.java b/src/main/java/org/bench4q/master/testPlan/TestPlanContainer.java index abd091f6..6cd74406 100644 --- a/src/main/java/org/bench4q/master/testPlan/TestPlanContainer.java +++ b/src/main/java/org/bench4q/master/testPlan/TestPlanContainer.java @@ -49,20 +49,4 @@ public class TestPlanContainer { } return finish; } - - // @Scheduled(cron = "15 */1 * * * *") - // public void queryFinished() { - // if (this.getTaskQueue().isEmpty()) { - // return; - // } - // for (UUID testPlanId : this.getTaskQueue().keySet()) { - // TestPlanContext testPlanContext = this.getTaskQueue().get( - // testPlanId); - // if (testPlanContext == null) { - // return; - // } - // testPlanContext.executeScriptsBrief(); - // } - // } - } diff --git a/src/main/java/org/bench4q/master/testPlan/TestPlanContext.java b/src/main/java/org/bench4q/master/testPlan/TestPlanContext.java index a5740451..c1e871a7 100644 --- a/src/main/java/org/bench4q/master/testPlan/TestPlanContext.java +++ b/src/main/java/org/bench4q/master/testPlan/TestPlanContext.java @@ -67,7 +67,6 @@ public class TestPlanContext { int result = 0; for (RunningScriptModel runningScriptModel : this.getRunningScriptMap() .values()) { - result += runningScriptModel.getRequireLoad(); } return result; diff --git a/src/main/java/org/bench4q/master/testPlan/highavailable/HighAvailablePool.java b/src/main/java/org/bench4q/master/testPlan/highavailable/HighAvailablePool.java index 73e2b1aa..2cc840fe 100644 --- a/src/main/java/org/bench4q/master/testPlan/highavailable/HighAvailablePool.java +++ b/src/main/java/org/bench4q/master/testPlan/highavailable/HighAvailablePool.java @@ -121,7 +121,6 @@ public class HighAvailablePool { _doForBreakDown(model, agents.get(i).getHostName()); continue; } - _doForHealth(model, agents.get(i)); } } diff --git a/src/main/java/org/bench4q/master/testPlan/loadcommand/ScriptLoadBase.java b/src/main/java/org/bench4q/master/testPlan/loadcommand/ScriptLoadBase.java index a0d09641..cae87dba 100644 --- a/src/main/java/org/bench4q/master/testPlan/loadcommand/ScriptLoadBase.java +++ b/src/main/java/org/bench4q/master/testPlan/loadcommand/ScriptLoadBase.java @@ -119,6 +119,7 @@ public abstract class ScriptLoadBase implements LoadTransaction { } result.setRequireLoad(this.getRunningScriptModel().getRequireLoad()); result.setConfig(this.getRunningScriptModel().getConfig()); + result.setTestPlanID(this.getTestPlanRunID()); return result; } catch (Exception e) { diff --git a/src/main/java/org/bench4q/master/testPlan/schedulscript/ExecutionOverTask.java b/src/main/java/org/bench4q/master/testPlan/schedulscript/ExecutionOverTask.java index 14315d98..b9544e53 100644 --- a/src/main/java/org/bench4q/master/testPlan/schedulscript/ExecutionOverTask.java +++ b/src/main/java/org/bench4q/master/testPlan/schedulscript/ExecutionOverTask.java @@ -38,6 +38,7 @@ public class ExecutionOverTask extends TimerTask { this.agentService.stop(runningAgentModel.getAgent(), runningAgentModel.getAgentRunId()); } + this.getRunningScriptModel().setFinish(true); System.out.println("execute ExecutionOverTask"); } }