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

add a fault tolerance skeleton to be filled

This commit is contained in:
Tienan Chen 2013-11-05 09:37:10 +08:00
parent 19b789d00e
commit 0bc53295b5
7 changed files with 73 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/bench4q/master/testPlan/highavailable/BriefAgentFault.java Normal file
View File

@ -0,0 +1,7 @@
package org.bench4q.master.testPlan.highavailable;
public class BriefAgentFault implements FaultTolerance {
public void doTolerance() {
}
}

2
src/main/java/org/bench4q/master/testPlan/highavailable/FaultTolerance.java
View File

@ -1,5 +1,5 @@
package org.bench4q.master.testPlan.highavailable;
public interface FaultTolerance {
public void doFaultTolerance();
public void doTolerance();
}

47
src/main/java/org/bench4q/master/testPlan/highavailable/HighAvailablePool.java
View File

@ -139,6 +139,10 @@ public class HighAvailablePool {
substituteOnBoard(agentRunBlotter, agentRunId);
agentRunBlotter.getRunningAgentModel().getAgent()
.setCurrentStatus(AgentService.AGENT_STATUS_BreakDown);
// TODO: update the status in Context, but first i want to know if
// context and runBlotter are using the same runningAgentModel
// TestPlanContext testPlanContext = this.getTestPlanContainer()
// .getRunningTestPlans().get(agentRunBlotter.getTestPlanId());
}
}
@ -173,7 +177,6 @@ public class HighAvailablePool {
private void _doForHealth(ServerStatusModel newModel, Agent agent) {
_arrageUnfinishedTest(newModel, agent);
// _arrangeFinishedTest(newModel, agent.getHostName());
if (agent.getCurrentStatus() == AgentService.AGENT_STATUS_Idel) {
this.setMaxLoadOfHAPool(this.getMaxLoadOfHAPool()
+ (long) agent.getRemainLoad());
@ -195,25 +198,6 @@ public class HighAvailablePool {
agent.getHostName());
}
// private void _arrangeFinishedTest(ServerStatusModel newModel,
// String hostName) {
// for (UUID agentRunId : _queryAgentNewFinishTest(newModel, hostName))
// {
// AgentRunBlotter agentRunBlotter = this.getAgentRunBlotters().get(
// agentRunId);
// if (agentRunBlotter == null) {
// return;
// }
// RunningAgentModel runningAgentModel = agentRunBlotter
// .getRunningAgentModel();
// if (runningAgentModel == null) {
// return;
// }
// this.agentService.backLoadToAgent(runningAgentModel.getAgent()
// .getHostName(), runningAgentModel.getLoadInUse());
// }
// }
private List<UUID> queryUnfinishedTest(ServerStatusModel newModel,
String hostName) {
if (newModel == null) {
@ -224,27 +208,4 @@ public class HighAvailablePool {
return newModel.getRunningTests();
}
// private List<UUID> _queryAgentNewFinishTest(ServerStatusModel newModel,
// String hostName) {
// ServerStatusModel previousModel = this.agentStatusOfPreviousBeatMap
// .get(hostName);
// List<UUID> previousFinishTestList = new ArrayList<UUID>();
// List<UUID> currentFinishTestList = new ArrayList<UUID>();
// List<UUID> result = new ArrayList<UUID>();
//
// if (previousModel == null) {
// return newModel.getFinishedTests();
// }
//
// previousFinishTestList = previousModel.getFinishedTests();
// currentFinishTestList = newModel.getFinishedTests();
// for (int i = 0; i < currentFinishTestList.size(); i++) {
// if (previousFinishTestList.contains(currentFinishTestList.get(i))) {
// continue;
// }
// result.add(currentFinishTestList.get(i));
// }
// return result;
// }
}

7
src/main/java/org/bench4q/master/testPlan/highavailable/RunAgentFault.java Normal file
View File

@ -0,0 +1,7 @@
package org.bench4q.master.testPlan.highavailable;
public class RunAgentFault implements FaultTolerance {
public void doTolerance() {
}
}

24
src/main/java/org/bench4q/master/testPlan/highavailable/StopAgentFault.java Normal file
View File

@ -0,0 +1,24 @@
package org.bench4q.master.testPlan.highavailable;
import org.bench4q.master.testPlan.AgentRunBlotter;
public class StopAgentFault implements FaultTolerance {
private AgentRunBlotter agentBlotter;
public AgentRunBlotter getAgentBlotter() {
return agentBlotter;
}
public void setAgentBlotter(AgentRunBlotter agentBlotter) {
this.agentBlotter = agentBlotter;
}
public StopAgentFault(AgentRunBlotter agentRunBlotter) {
this.setAgentBlotter(agentRunBlotter);
}
public void doTolerance() {
// TODO: fulfill this function
}
}

1
src/main/java/org/bench4q/master/testPlan/schedulscript/ExecutionOverTask.java
View File

@ -113,5 +113,6 @@ public class ExecutionOverTask extends TimerTask {
this.getTestPlanContainer().getRunningTestPlans().remove(testPlanId);
this.getTestPlanService().handleTestPlanComplete(testPlanId);
// TODO: remove the testPlan's other info in HA
// eg. agentRunBlotters
}
}

29
src/test/java/org/bench4q/master/test/PolymorphismTest.java Normal file
View File

@ -0,0 +1,29 @@
package org.bench4q.master.test;
public class PolymorphismTest {
public void shout() {
shoutTwice();
}
public void shoutTwice() {
System.out.println("aaaaaa");
System.out.println("aaaaaa");
}
public static void main(String[] args) {
PolymorphismTest poly = new ChildTest();
System.out.println("poly shout is ");
poly.shout();
ChildTest childTest = new ChildTest();
System.out.println("child shout is ");
childTest.shout();
}
}
class ChildTest extends PolymorphismTest {
public void shoutTwice() {
System.out.println("bbbbbbb");
System.out.println("bbbbbbb");
}
}