cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject [1/2] git commit: updated refs/heads/4.5 to 968ca06
Date Tue, 18 Nov 2014 22:23:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 a4ebc31d9 -> 968ca060e


CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not
running the VM with root disk from new storage.

Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster
provided in the deployment plan.


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

Branch: refs/heads/4.5
Commit: 7f548940450887e691b3c10b5487a49f0d75b63c
Parents: a4ebc31
Author: Prachi Damle <prachi.damle@citrix.com>
Authored: Mon Nov 17 20:27:01 2014 -0800
Committer: Prachi Damle <prachi.damle@citrix.com>
Committed: Tue Nov 18 14:07:49 2014 -0800

----------------------------------------------------------------------
 server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f548940/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index e8cf11f..3cbe489 100755
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -372,6 +372,10 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
                 s_logger.debug("The last host of this VM cannot be found");
             } else if (avoids.shouldAvoid(host)) {
                 s_logger.debug("The last host of this VM is in avoid set");
+            } else if (plan.getClusterId() != null && host.getClusterId() != null
+                    && !plan.getClusterId().equals(host.getClusterId())) {
+                s_logger.debug("The last host of this VM cannot be picked as the plan specifies
different clusterId: "
+                        + plan.getClusterId());
             } else if (_capacityMgr.checkIfHostReachMaxGuestLimit(host)) {
                 s_logger.debug("The last Host, hostId: " + host.getId() +
                         " already has max Running VMs(count includes system VMs), skipping
this and trying other available hosts");


Mime
View raw message