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

remove the result.jsp to web

This commit is contained in:
Tienan Chen 2013-09-10 17:15:40 +08:00 committed by fanfuxiaoran
parent 97c06b9b70
commit a8b38692c7
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/bench4q/master/api/AgentController.java
View File

@ -30,7 +30,7 @@ public class AgentController extends BaseController {
this.agentStateService = agentStateService;
}
public AgentService getAgentPoolService() {
public AgentService getAgentService() {
return agentPoolService;
}
@ -46,12 +46,12 @@ public class AgentController extends BaseController {
return _setAgentResponseModel(false,
"you don't have the power to add agent to pool!", null);
}
synchronized (this.getAgentPoolService().getAgentLock()) {
if (!this.getAgentPoolService().addAgentToPool(agent)) {
synchronized (this.getAgentService().getAgentLock()) {
if (!this.getAgentService().addAgentToPool(agent)) {
return _setAgentResponseModel(false,
"add agent to DB fails in addAgentToPool", null);
}
this.getAgentPoolService().getAgentLock().notifyAll();
this.getAgentService().getAgentLock().notifyAll();
return _setAgentResponseModel(true, "", null);
}
}
@ -64,8 +64,8 @@ public class AgentController extends BaseController {
return _setAgentResponseModel(false,
"you don't have the power to remove agent from pool!", null);
}
synchronized (this.getAgentPoolService().getAgentLock()) {
if (!this.getAgentPoolService().removeAgentFromPool(hostName)) {
synchronized (this.getAgentService().getAgentLock()) {
if (!this.getAgentService().removeAgentFromPool(hostName)) {
return _setAgentResponseModel(false,
"remove agent from DB fails in removeAgentFromPool",
null);
@ -78,7 +78,7 @@ public class AgentController extends BaseController {
RequestMethod.GET })
@ResponseBody
public AgentResponseModel queryAgentList() {
List<Agent> list = this.getAgentPoolService().loadAgentPoolFromDB();
List<Agent> list = this.getAgentService().loadAgentPoolFromDB();
return _setAgentResponseModel(true, "", list);
}

3
src/main/java/org/bench4q/master/testPlan/HighAvailableAgentPool.java
View File

@ -89,7 +89,8 @@ public class HighAvailableAgentPool {
@Scheduled(cron = "0 */1 * * * *")
public void timerTask() {
synchronized (this.highAvailablePool) {
// synchronized (this.highAvailablePool) {
synchronized (this.agentService.getAgentLock()) {
_heartBeatsAndUpdateHAPool();
}
System.out.println("hah");