bug CS-14718: wait util xenserver join pool operation stablize.

anthonyxu · anthonyxu · commit fe3200c72e44 · 2012-05-02T19:58:37.000-07:00
status CS-14718: resolved fixed
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -3975,9 +3975,19 @@ public Type getType() {
     protected boolean getHostInfo(Connection conn) throws IllegalArgumentException{
         try {
             Host myself = Host.getByUuid(conn, _host.uuid);
+            Set<HostCpu> hcs = null;
+            for (int i = 0; i < 10; i++) {
+                hcs = myself.getHostCPUs(conn);
+                _host.cpus = hcs.size();
+                if (_host.cpus > 0) {
+                    break;
+                }
+                Thread.sleep(5000);
+            }
+            if (_host.cpus <= 0) {
+                throw new CloudRuntimeException("Cannot get the numbers of cpu from XenServer host " + _host.ip);
+            }
 
-            Set<HostCpu> hcs = myself.getHostCPUs(conn);
-            _host.cpus = hcs.size();
             for (final HostCpu hc : hcs) {
                 _host.speed = hc.getSpeed(conn).intValue();
                 break;
@@ -4051,7 +4061,7 @@ protected boolean getHostInfo(Connection conn) throws IllegalArgumentException{
         } catch (XenAPIException e) {
             s_logger.warn("Unable to get host information for " + _host.ip, e);
             return false;
-        } catch (XmlRpcException e) {
+        } catch (Exception e) {
             s_logger.warn("Unable to get host information for " + _host.ip, e);
             return false;
         }
