From cdc7c4083cdb6d482c4b0941b93af54539e01594 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 3 Feb 2012 15:44:45 -0800
Subject: [PATCH] bug 12844 : use plugin echo main to test if master can
 connect to slave

status 12844: resolved fixed

reviewed-by : edison
---
 .../hypervisor/xen/resource/XenServerConnectionPool.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index ccac8c341a5..d2124fc9f55 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -641,7 +641,13 @@ public class XenServerConnectionPool {
             if (s_managePool) {
                 try {
                     Map<String, String> args = new HashMap<String, String>();
-                    host.callPlugin(mConn, "vmops", "pingxenserver", args);
+                    host.callPlugin(mConn, "echo", "main", args);
+                } catch (Types.SessionInvalid e) {
+                    if (s_logger.isDebugEnabled()) {
+                        String msg = "Catch Exception: " + e.getClass().getName() + " Can't connect host " + ipAddress + " due to " + e.toString();
+                        s_logger.debug(msg);
+                    }
+                    PoolEmergencyResetMaster(ipAddress, mConn.getIp(), mConn.getUsername(), mConn.getPassword());
                 } catch (Types.CannotContactHost e ) {
                     if (s_logger.isDebugEnabled()) {
                         String msg = "Catch Exception: " + e.getClass().getName() + " Can't connect host " + ipAddress + " due to " + e.toString();