Repository: cloudstack Updated Branches: refs/heads/4.4 52f40433b -> 33c0d6c7b
CLOUDSTACK-6438 CLOUDSTACK-6442 XAPI plugins must be copied to XS master first. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33c0d6c7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33c0d6c7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33c0d6c7 Branch: refs/heads/4.4 Commit: 33c0d6c7bbb2e85f87935dee64dccbe2ee7f264c Parents: 52f4043 Author: Anthony Xu <[email protected]> Authored: Wed Apr 23 15:30:36 2014 -0700 Committer: Anthony Xu <[email protected]> Committed: Wed Apr 23 15:30:36 2014 -0700 ---------------------------------------------------------------------- .../hypervisor/xen/resource/CitrixResourceBase.java | 16 ++++++++++------ .../xen/resource/Xenserver625Resource.java | 5 +++-- 2 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33c0d6c7/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 3fc7974..ecdfb5c 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -4666,8 +4666,16 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe protected SetupAnswer execute(SetupCommand cmd) { Connection conn = getConnection(); - setupServer(conn); try { + Map<Pool, Pool.Record> poolRecs = Pool.getAllRecords(conn); + if (poolRecs.size() != 1) { + throw new CloudRuntimeException("There are " + poolRecs.size() + " pool for host :" + _host.uuid); + } + Host master = poolRecs.values().iterator().next().master; + setupServer(conn, master); + Host host = Host.getByUuid(conn, _host.uuid); + setupServer(conn, host); + if (!setIptables(conn)) { s_logger.warn("set xenserver Iptable failed"); return null; @@ -4690,7 +4698,6 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe return null; } cleanupTemplateSR(conn); - Host host = Host.getByUuid(conn, _host.uuid); try { if (cmd.useMultipath()) { // the config value is set to true @@ -4804,14 +4811,11 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } /* return : if setup is needed */ - protected boolean setupServer(Connection conn) { + protected boolean setupServer(Connection conn, Host host) { String packageVersion = CitrixResourceBase.class.getPackage().getImplementationVersion(); String version = this.getClass().getName() + "-" + (packageVersion == null ? Long.toString(System.currentTimeMillis()) : packageVersion); try { - Host host = Host.getByUuid(conn, _host.uuid); - /* enable host in case it is disabled somehow */ - host.enable(conn); /* push patches to XenServer */ Host.Record hr = host.getRecord(conn); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33c0d6c7/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java index b1442de..4014364 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java @@ -30,6 +30,7 @@ import org.apache.xmlrpc.XmlRpcException; import com.xensource.xenapi.Connection; import com.xensource.xenapi.Types; import com.xensource.xenapi.VM; +import com.xensource.xenapi.Host; import org.apache.cloudstack.hypervisor.xenserver.XenServerResourceNewBase; @@ -107,7 +108,7 @@ public class Xenserver625Resource extends XenServerResourceNewBase { } @Override - protected boolean setupServer(Connection conn) { + protected boolean setupServer(Connection conn,Host host) { com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_host.ip, 22); try { sshConnection.connect(null, 60000, 60000); @@ -131,7 +132,7 @@ public class Xenserver625Resource extends XenServerResourceNewBase { } finally { sshConnection.close(); } - return super.setupServer(conn); + return super.setupServer(conn, host); } @Override
