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

Move LockMasterListener initialization to earlier in the code 

This is not perfect fix but should address 99% of the issues.  The only
time an issue could happen is if something in the bootstrap or system
context tried to lock a row.  Which shouldn't happen at the moment.  If
we find that to be an issue, the LockMasterListener could move to system
context and be inject here.
This commit is contained in:
Darren Shepherd 2013-10-24 15:34:38 -07:00
parent 0ef8b8770a
commit d178b25daa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -599,6 +599,8 @@ import com.cloud.vm.dao.VMInstanceDao;
public class ManagementServerImpl extends ManagerBase implements ManagementServer {
public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName());
private static final LockMasterListener s_lockMasterListener = new LockMasterListener(ManagementServerNode.getManagementServerId());
@Inject
public AccountManager _accountMgr;
@Inject
@ -818,7 +820,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
public boolean start() {
s_logger.info("Startup CloudStack management server...");
_clusterMgr.registerListener(new LockMasterListener(ManagementServerNode.getManagementServerId()));
_clusterMgr.registerListener(s_lockMasterListener);
enableAdminUser("password");
return true;