p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git

This commit is contained in:
hmm 2014-09-04 14:15:24 +08:00
parent 9756ef1999 55a78b46fe
commit 5a0a1074c9
11 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/engine/ScenarioContext.java
View File

@ -179,8 +179,8 @@ public class ScenarioContext implements Observer {
}
public void stop() {
this.getSchedule().stop();
this.setFinished(true);
this.getExecutor().shutdownNow();
this.getSchedule().stop();
}
}

5
Bench4Q-Agent/src/test/java/org/bench4q/agent/test/scenario/engine/Test_Shedule.java
View File

@ -94,4 +94,9 @@ public class Test_Shedule {
Schedule schedule = Schedule.build(TestBase.buildScheduleModel());
assertEquals(60 * 1000, schedule.getScheduleRange());
}
@Test
public void test_WithShortScheduleLessThenOneSecond() {
// TODO:
}
}

17
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java
View File

@ -21,6 +21,7 @@ import org.bench4q.share.models.agent.RunScenarioModel;
import org.bench4q.share.models.agent.RunScenarioResultModel;
import org.bench4q.share.models.agent.StopTestModel;
import org.bench4q.share.models.agent.TestBriefStatusModel;
import org.bench4q.share.models.agent.scriptrecord.ScheduleModel;
@Entity
@Table(name = "runningAgent")
@ -179,13 +180,19 @@ public class RunningAgentDB implements RunningAgentInterface {
public boolean distributeScriptAndParams() {
Script script2 = this.getTestPlanScript().getScript();
RunScenarioModel runScenarioModel = (RunScenarioModel) MarshalHelper
.tryUnmarshal(RunScenarioModel.class,
this.getTestPlanScript().getFilteredScriptCnt());
.tryUnmarshal(RunScenarioModel.class, this.getTestPlanScript()
.getFilteredScriptCnt());
runScenarioModel.setPoolSize(getLoadInUse());
RunScenarioResultModel runScenarioResultModel = this
.getAgentMessenger().submitScenrioWithParams(this.getAgent(),
this.getAgentRunId(), script2.loadParamFiles(),
runScenarioModel, this.getRunningScript().getStartTime());
.getAgentMessenger().submitScenrioWithParams(
this.getAgent(),
this.getAgentRunId(),
script2.loadParamFiles(),
runScenarioModel,
(ScheduleModel) MarshalHelper.tryUnmarshal(
ScheduleModel.class, this.getTestPlanScript()
.getScheduleContent()),
this.getRunningScript().getStartTime());
if (runScenarioResultModel == null) {
return false;
}

7
Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
View File

@ -199,7 +199,6 @@ public class TestPlanScript implements RunningScriptInterface {
ExecutionOverTask executionOverTask = new ExecutionOverTask(this);
timer.schedule(executionOverTask, (testScriptConfig.getExecuteRange())
* SECOND_MILISECOND_UNIT_CONVERSION);
return true;
}
@ -303,6 +302,12 @@ public class TestPlanScript implements RunningScriptInterface {
return this.getTestPlan().getCurrentStartTime();
}
@Transient
public String getScheduleContent() {
return this.getPlanedConfig().getScheduleContent();
}
@Transient
public String getFilteredScriptCnt() {
return filteredScriptCnt;
}

1
Bench4Q-Master/src/main/java/org/bench4q/master/domain/factory/TestPlanFactory.java
View File

@ -223,6 +223,7 @@ public class TestPlanFactory {
private PlanedConfig createAPlanedConfigWithoutId(ScheduleModel schedule) {
PlanedConfig result = new PlanedConfig();
result.setExecuteRange(schedule.getExecuteRange());
result.setScheduleContent(MarshalHelper.tryMarshal(schedule));
return result;
}

4
Bench4Q-Master/src/main/java/org/bench4q/master/infrastructure/communication/AgentMessenger.java
View File

@ -12,13 +12,15 @@ import org.bench4q.share.models.agent.RunScenarioResultModel;
import org.bench4q.share.models.agent.ServerStatusModel;
import org.bench4q.share.models.agent.StopTestModel;
import org.bench4q.share.models.agent.TestBriefStatusModel;
import org.bench4q.share.models.agent.scriptrecord.ScheduleModel;
public interface AgentMessenger {
public RunScenarioResultModel bookTest(Agent agent, int requireLoad);
public RunScenarioResultModel submitScenrioWithParams(Agent agent,
UUID agentRunId, List<File> paramFiles,
final RunScenarioModel runScenarioModel, Date realStartDate);
final RunScenarioModel runScenarioModel,
final ScheduleModel scheduleModel, Date realStartDate);
public RunScenarioResultModel runWithParams(Agent agent, UUID agentRunId);

14
Bench4Q-Master/src/main/java/org/bench4q/master/infrastructure/communication/impl/AgentMessengerImpl.java
View File

@ -23,6 +23,7 @@ import org.bench4q.share.models.agent.RunScenarioResultModel;
import org.bench4q.share.models.agent.ServerStatusModel;
import org.bench4q.share.models.agent.StopTestModel;
import org.bench4q.share.models.agent.TestBriefStatusModel;
import org.bench4q.share.models.agent.scriptrecord.ScheduleModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -75,15 +76,16 @@ public class AgentMessengerImpl implements AgentMessenger {
public RunScenarioResultModel submitScenrioWithParams(Agent agent,
UUID agentRunId, List<File> paramFiles,
final RunScenarioModel runScenarioModel, Date realStartDate) {
final RunScenarioModel runScenarioModel,
final ScheduleModel scheduleModel, Date realStartDate) {
HttpResponse httpResponse = null;
try {
final String modelContent = MarshalHelper
.tryMarshal(runScenarioModel);
final Map<String, String> stringParts = new LinkedHashMap<String, String>();
stringParts.put("scenarioModel", modelContent);
stringParts.put("realStartTime",
String.valueOf(realStartDate.getTime()));
stringParts.put("scheduleContent",
MarshalHelper.tryMarshal(scheduleModel));
httpResponse = this.httpRequester.postFiles(null,
buildBaseUrl(agent) + "/test/submitScenarioWithParams/"
+ agentRunId + "/" + realStartDate.getTime(),
@ -99,13 +101,15 @@ public class AgentMessengerImpl implements AgentMessenger {
public Future<RunScenarioResultModel> submitScenarioWithParamsAsync(
final Agent agent, final UUID agentRunId,
final List<File> paramFiles,
final RunScenarioModel runScenarioModel, final Date realStartDate) {
final RunScenarioModel runScenarioModel,
final ScheduleModel scheduleModel, final Date realStartDate) {
return this.executorService
.submit(new Callable<RunScenarioResultModel>() {
@Override
public RunScenarioResultModel call() throws Exception {
return submitScenrioWithParams(agent, agentRunId,
paramFiles, runScenarioModel, realStartDate);
paramFiles, runScenarioModel, scheduleModel,
realStartDate);
}
});
}

1
Bench4Q-Master/src/test/java/org/bench4q/master/integrated/Test_TestPlan.java
View File

@ -58,6 +58,7 @@ public class Test_TestPlan extends TestBase_MakeUpTestPlan {
.getTestPlanInDomainBy(getTestPlanRunIdUuid());
TestPlan testPlanInDomain = this.getTestPlanFactory().convertToDomain(
testPlanFromRepo);
this.getTestPlanRepository().attachRunningTestPlan(testPlanInDomain);
testPlanInDomain.run();
this.getTestPlanRepository().attachRunningTestPlan(testPlanInDomain);
assertEquals(TestPlanStatus.InRunning.name(),

4
Bench4Q-Master/src/test/java/org/bench4q/master/integrated/communication/Test_AgentMessenger.java
View File

@ -17,6 +17,7 @@ import org.bench4q.master.unitTest.TestBase_MakeUpTestPlan;
import org.bench4q.share.helper.MarshalHelper;
import org.bench4q.share.models.agent.RunScenarioModel;
import org.bench4q.share.models.agent.RunScenarioResultModel;
import org.bench4q.share.models.agent.scriptrecord.ScheduleModel;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@ -41,6 +42,7 @@ public class Test_AgentMessenger extends TestBase_MakeUpTestPlan {
this.agentMessenger = agentMessenger;
}
// TODO: modify this to adapt to new code
@Test
public void testSubmitScenarioWithParamsAndRun() throws IOException,
JAXBException {
@ -74,7 +76,7 @@ public class Test_AgentMessenger extends TestBase_MakeUpTestPlan {
System.out.println(model.getRunId());
RunScenarioResultModel modelAfter = this.getAgentMessenger()
.submitScenrioWithParams(agent, model.getRunId(), paramFiles,
inputModel, new Date());
inputModel, new ScheduleModel(), new Date());
assertEquals(model.getRunId(), modelAfter.getRunId());
model = this.getAgentMessenger().runWithParams(agent, model.getRunId());
assertNotNull(model);

4
Bench4Q-Master/src/test/java/org/bench4q/master/unitTest/TestBase_MakeUpTestPlan.java
View File

@ -399,8 +399,8 @@ public class TestBase_MakeUpTestPlan extends TestBase {
model.setRequireLoad(EACH_SCRIPT_LOAD_SMALLSCALE);
ScheduleModel schedule = new ScheduleModel();
schedule.getPoints().add(new PointModel(0, 0));
schedule.getPoints().add(new PointModel(20, 10));
schedule.getPoints().add(new PointModel(60, 10));
schedule.getPoints().add(new PointModel(20 * 1000, 10));
schedule.getPoints().add(new PointModel(60 * 1000, 10));
model.setScheduleModel(schedule);
return model;
}

4
Bench4Q-Master/src/test/java/stubs/Mock_AgentMessenger.java
View File

@ -16,6 +16,7 @@ import org.bench4q.share.models.agent.RunScenarioResultModel;
import org.bench4q.share.models.agent.ServerStatusModel;
import org.bench4q.share.models.agent.StopTestModel;
import org.bench4q.share.models.agent.TestBriefStatusModel;
import org.bench4q.share.models.agent.scriptrecord.ScheduleModel;
import org.bench4q.share.models.agent.statistics.AgentBehaviorsBriefModel;
import org.bench4q.share.models.agent.statistics.AgentBriefStatusModel;
import org.bench4q.share.models.agent.statistics.AgentPagesBriefModel;
@ -35,7 +36,8 @@ public class Mock_AgentMessenger implements AgentMessenger {
@Override
public RunScenarioResultModel submitScenrioWithParams(Agent agent,
UUID agentRunId, List<File> paramFiles,
RunScenarioModel runScenarioModel, Date realStartTime) {
RunScenarioModel runScenarioModel,
final ScheduleModel scheduleModel, Date realStartTime) {
return new RunScenarioResultModel(this.testId);
}