From 6f7b9eafa1aa4df71017d22496ce0ca7263e0583 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 16 Feb 2011 14:39:00 -0800
Subject: [PATCH] this is to reset master for the secondary master in the same
 cluster. It may happend when you reboot the master of a cluster, there might
 be 2 master after the old master comes back

---
 .../hypervisor/xen/resource/XenServerConnectionPool.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index 8ca5378dd02..6dd10d77ed7 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -451,7 +451,6 @@ public class XenServerConnectionPool {
                     // wait 2 second
                     forceSleep(2);
                 }
-                
             }
             // then try emergency reset master
             Set<Host> slaves = Host.getAll(conn);
@@ -533,7 +532,8 @@ public class XenServerConnectionPool {
                     if (s_logger.isDebugEnabled()) {
                         s_logger.debug(msg);
                     }
-                    throw new CloudRuntimeException(msg, e);
+                    PoolEmergencyResetMaster(ipAddress, mConn.getIp(), mConn.getUsername(), mConn.getPassword());
+                    return mConn;
                 } catch (Types.HostOffline e ) {
                     String msg = "Can't connect host " + ipAddress + " due to " + e.toString();
                     if (s_logger.isDebugEnabled()) {