From d178b25daa484dda44bb34e63cb719d1c3cc1519 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 24 Oct 2013 15:34:38 -0700 Subject: [PATCH] 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. --- server/src/com/cloud/server/ManagementServerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 1c6852379bc..e00c18235ed 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -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;