diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java index fb274090..24d1649f 100644 --- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java +++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java @@ -61,7 +61,7 @@ public class TestController { @RequestMapping(value = "/bookTest/{poolSize}", method = { RequestMethod.GET, RequestMethod.POST }) @ResponseBody - public RunScenarioResultModel bookTest(@PathVariable int poolSize, @RequestParam long startTime) { + public RunScenarioResultModel bookTest(@PathVariable int poolSize) { try { UUID runId = UUID.randomUUID(); this.getScenarioEngine().addRunningTestWithoutScenario(runId, @@ -75,10 +75,11 @@ public class TestController { } } - @RequestMapping(value = "/submitScenarioWithParams/{runId}", method = RequestMethod.POST) + @RequestMapping(value = "/submitScenarioWithParams/{runId}/{realStartTime}", method = RequestMethod.POST) @ResponseBody public String submitParams( @PathVariable UUID runId, + @PathVariable long realStartTime, @RequestParam(value = "files[]", required = false) List files, @RequestParam(value = "testShedule", required = false) String scheduleContent, @RequestParam(value = "scenarioModel") String scenarioModel) { @@ -88,7 +89,7 @@ public class TestController { RunScenarioModel runScenarioModel = (RunScenarioModel) MarshalHelper .unmarshal(RunScenarioModel.class, scenarioModel); this.getScenarioEngine().submitScenario(runId, - Scenario.scenarioBuilderWithCompile(runScenarioModel)); + Scenario.scenarioBuilderWithCompile(runScenarioModel), realStartTime); return MarshalHelper.tryMarshal(buildWith(runId)); } catch (Exception e) { logger.error("/submitScenarioWithParams", e); diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/MongoDB/MongoDBPlugin.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/MongoDB/MongoDBPlugin.java index 5769cbcf..f051bd86 100644 --- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/MongoDB/MongoDBPlugin.java +++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/MongoDB/MongoDBPlugin.java @@ -28,7 +28,6 @@ import com.mongodb.ServerAddress; @Plugin("MongoDBPlugin") public class MongoDBPlugin { private final String hostName; - private final int port; private final String dbName; private final String tableUnderTest = "users"; @@ -38,7 +37,6 @@ public class MongoDBPlugin { @Parameter(value = "port", type = SupportTypes.Field) int port, @Parameter(value = "dbName", type = SupportTypes.Field) String dbName) { this.hostName = hostName; - this.port = port; this.dbName = dbName; } diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioContext.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioContext.java index d0530543..18149e10 100644 --- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioContext.java +++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioContext.java @@ -101,8 +101,8 @@ public class ScenarioContext implements Observer { return scenarioContext; } - public ScenarioContext addScenrio(final Scenario scenario) { - ScenarioContext result = new ScenarioContext(this.testId, startDate, executor, this.dataCollector, pluginManager); + public ScenarioContext addScenrio(final Scenario scenario, final long realStartTime) { + ScenarioContext result = new ScenarioContext(this.testId, new Date(realStartTime), executor, this.dataCollector, pluginManager); result.setEndDate(new Date(scenario.getSchedule().getScheduleRange() + this.getStartDate().getTime())); result.setFinished(this.isFinished()); result.setScenario(scenario); diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEngine.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEngine.java index 5721b713..edfb0fcd 100644 --- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEngine.java +++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioEngine.java @@ -50,10 +50,10 @@ public class ScenarioEngine implements Observer { } } - public void submitScenario(UUID runId, final Scenario scenario) { + public void submitScenario(final UUID runId, final Scenario scenario, final long realStartTime) { try { ScenarioContext old = this.getRunningTests().get(runId); - this.getRunningTests().put(runId, old.addScenrio(scenario)); + this.getRunningTests().put(runId, old.addScenrio(scenario, realStartTime)); } catch (Exception e) { e.printStackTrace(); }