From f11d9064ca82ba38318c195fbbdc3f52a5ee7cc1 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 28 Feb 2011 12:13:52 -0800 Subject: [PATCH] bug 8754,8738: don't throw Exception for getCurrentStatus status 8754,8738: resolved fixed --- .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +- .../hypervisor/xen/resource/XenServerConnectionPool.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 4468dbfb182..c52187b7104 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -3499,8 +3499,8 @@ public abstract class CitrixResourceBase implements ServerResource { @Override public PingCommand getCurrentStatus(long id) { - Connection conn = getConnection(); try { + Connection conn = getConnection(); if (!pingxenserver()) { Thread.sleep(1000); if (!pingxenserver()) { diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java index f069f2411da..f9cef812e14 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java +++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java @@ -412,14 +412,15 @@ public class XenServerConnectionPool { // wait 2 second forceSleep(2); } + throw new CloudRuntimeException("Unable to reset master of slave " + slaveIp + + " to " + masterIp + "after 30 retry"); } catch (Exception e) { - + throw new CloudRuntimeException("Unable to reset master of slave " + slaveIp + + " to " + masterIp + " due to " + e.toString()); } finally { localLogout(slaveConn); slaveConn = null; } - throw new CloudRuntimeException("Unable to reset master of slave " + slaveIp - + " to " + masterIp + "after 30 retry"); } protected void ensurePoolIntegrity(Connection conn,