etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed set_dhcp_entry issue, don't need to lock an router entry, start function will handle concurrent starting domr

This commit is contained in:
anthony 2011-03-21 15:19:09 -07:00
parent abb2e2b2ff
commit d0320896f3
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -750,7 +750,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
}
State state = router.getState();
if (state != State.Starting && state != State.Running) {
if (state != State.Running) {
router = this.start(router, _accountService.getSystemUser(), _accountService.getSystemAccount(), params);
}
@ -818,21 +818,9 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
router.setRole(Role.DHCP_USERDATA);
router = _itMgr.allocate(router, template, _offering, networks, plan, null, owner);
}
Long routeId = router.getId();
router = _routerDao.acquireInLockTable(routeId, 600);
if (router == null) {
throw new ConcurrentOperationException("Unable to acquire router: " + routeId);
}
try {
State state = router.getState();
if (state == State.Starting ) {
throw new RuntimeException("router " + routeId + " is in Starting state");
}
if (state != State.Running) {
router = this.start(router, _accountService.getSystemUser(), _accountService.getSystemAccount(), params);
}
} finally {
_routerDao.releaseFromLockTable(routeId);
State state = router.getState();
if (state != State.Running) {
router = this.start(router, _accountService.getSystemUser(), _accountService.getSystemAccount(), params);
}
// Creating stats entry for router
UserStatisticsVO stats = _userStatsDao.findBy(owner.getId(), dcId, null, router.getId(), router.getType().toString());