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

bug 8754,8738: don't throw Exception for getCurrentStatus 

status 8754,8738: resolved fixed
This commit is contained in:
anthony 2011-02-28 12:13:52 -08:00
parent 88a310aa29
commit f11d9064ca
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -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()) {

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

@ -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,