apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove host.enable from XenServerConnectionPool

Browse Source
This commit is contained in:
anthony 2012-01-25 17:50:39 -08:00
parent df45347f3f
commit 27c59872a3
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
View File

@ -218,7 +218,6 @@ public class XenServerConnectionPool {
int wait) throws XmlRpcException, XenAPIException { int wait) throws XmlRpcException, XenAPIException {
synchronized (poolUuid.intern()) { synchronized (poolUuid.intern()) {
String masterIp = host.getAddress(conn); String masterIp = host.getAddress(conn);
PoolSyncDB(conn);
s_logger.debug("Designating the new master to " + masterIp); s_logger.debug("Designating the new master to " + masterIp);
Pool.designateNewMaster(conn, host); Pool.designateNewMaster(conn, host);
Connection slaveConn = null; Connection slaveConn = null;
@ -253,7 +252,6 @@ public class XenServerConnectionPool {
loginWithPassword(masterConn, username, password, APIVersion.latest().toString()); loginWithPassword(masterConn, username, password, APIVersion.latest().toString());
removeConnect(poolUuid); removeConnect(poolUuid);
ensurePoolIntegrity(masterConn, masterIp, username, password, wait); ensurePoolIntegrity(masterConn, masterIp, username, password, wait);
PoolSyncDB(masterConn);
return; return;
} catch (Types.HostIsSlave e) { } catch (Types.HostIsSlave e) {
s_logger.debug("HostIsSlaveException: Still waiting for the conversion to the master"); s_logger.debug("HostIsSlaveException: Still waiting for the conversion to the master");
@ -351,27 +349,6 @@ public class XenServerConnectionPool {
} }
static void PoolSyncDB(Connection conn) {
try {
Set<Host> hosts = Host.getAll(conn);
for (Host host : hosts) {
try {
host.enable(conn);
} catch (Exception e) {
}
}
} catch (Exception e) {
s_logger.debug("Enbale host failed due to " + e.getMessage()
+ e.toString());
}
try {
Pool.syncDatabase(conn);
} catch (Exception e) {
s_logger.debug("Sync Database failed due to " + e.getMessage()
+ e.toString());
}
}
void PoolEmergencyTransitionToMaster(String slaveIp, String username, Queue<String> password) { void PoolEmergencyTransitionToMaster(String slaveIp, String username, Queue<String> password) {
if (!s_managePool) { if (!s_managePool) {
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
@ -663,7 +640,8 @@ public class XenServerConnectionPool {
if ( mConn != null ) { if ( mConn != null ) {
if (s_managePool) { if (s_managePool) {
try { try {
host.enable(mConn); Map<String, String> args = new HashMap<String, String>();
host.callPlugin(mConn, "vmops", "pingxenserver", args);
} catch (Types.CannotContactHost e ) { } catch (Types.CannotContactHost e ) {
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
String msg = "Catch Exception: " + e.getClass().getName() + " Can't connect host " + ipAddress + " due to " + e.toString(); String msg = "Catch Exception: " + e.getClass().getName() + " Can't connect host " + ipAddress + " due to " + e.toString();