cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [22/50] [abbrv] git commit: updated refs/heads/rbd-snap-clone to 2355a81
Date Thu, 23 May 2013 21:19:57 GMT
CLOUDSTACK-2567 - check for ! dmcEnabled.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a67728b3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a67728b3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a67728b3

Branch: refs/heads/rbd-snap-clone
Commit: a67728b312fbf3a4e6e7f7fb3914a45d22997dbf
Parents: 4e09079
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Wed May 22 15:30:53 2013 +0530
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Wed May 22 15:31:18 2013 +0530

----------------------------------------------------------------------
 .../xen/resource/CitrixResourceBase.java           |    4 ++--
 .../xen/resource/XenServer56FP1Resource.java       |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a67728b3/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 d08aaec..4680fde 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
@@ -661,8 +661,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             Set<VM> vms = VM.getByNameLabel(conn, vmName);
             Host host = Host.getByUuid(conn, _host.uuid);
 
-            // If DMC is not enable then dont execute this command.
-            if (isDmcEnabled(conn, host)) {
+            // If DMC is not enable then don't execute this command.
+            if (!isDmcEnabled(conn, host)) {
                 String msg = "Unable to scale the vm: " + vmName + " as DMC - Dynamic memory
control is not enabled for the XenServer:" + _host.uuid + " ,check your license and hypervisor
version.";
                 s_logger.info(msg);
                 return new ScaleVmAnswer(cmd, false, msg);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a67728b3/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
index 78ad236..54aeef5 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java
@@ -244,6 +244,9 @@ public class XenServer56FP1Resource extends XenServer56Resource {
     protected boolean isDmcEnabled(Connection conn, Host host) throws XenAPIException, XmlRpcException
{
         Map<String, String> hostParams = new HashMap<String, String>();
         hostParams = host.getLicenseParams(conn);
-        return hostParams.get("restrict_dmc").equalsIgnoreCase("false");
+
+        Boolean isDmcEnabled = hostParams.get("restrict_dmc").equalsIgnoreCase("false");
+
+        return isDmcEnabled;
     }
 }


Mime
View raw message