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

fixes a bug where management server has conflicts causes problems

This commit is contained in:
Alex Huang 2011-04-27 14:07:18 -07:00
parent e66baae84e
commit e8e9bbccfb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/cluster/ClusterManagerImpl.java
View File

@ -689,8 +689,15 @@ public class ClusterManagerImpl implements ClusterManager {
s_logger.info("Starting cluster manager, msid : " + _msid);
}
try {
checkConflicts();
} catch (ConfigurationException e1) {
throw new CloudRuntimeException("Conflicts in management server configurations detected", e1);
}
Transaction txn = Transaction.currentTxn();
try {
txn.start();
final Class<?> c = this.getClass();
@ -847,8 +854,6 @@ public class ClusterManagerImpl implements ClusterManager {
throw new ConfigurationException("Unable to set current cluster service adapter");
}
checkConflicts();
if(s_logger.isInfoEnabled()) {
s_logger.info("Cluster manager is configured.");
}