You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/07/16 22:42:14 UTC
[4/4] git commit: updated refs/heads/4.2 to f53a063
CloudStack-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
Removing the code that works with volume reservation. This is not used currently.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f53a063d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f53a063d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f53a063d
Branch: refs/heads/4.2
Commit: f53a063d1481c5a6d495efcd939197db2ab6299a
Parents: d70076e
Author: Prachi Damle <pr...@cloud.com>
Authored: Tue Jul 16 13:10:34 2013 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Tue Jul 16 13:41:19 2013 -0700
----------------------------------------------------------------------
.../engine/cloud/entity/api/VMEntityManagerImpl.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f53a063d/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
index 90c1db5..8336c3f 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
@@ -221,15 +221,6 @@ public class VMEntityManagerImpl implements VMEntityManager {
VMReservationVO vmReservation = _reservationDao.findByReservationId(reservationId);
if(vmReservation != null){
// Pass it down
- Long poolId = null;
- Map<Long, Long> storage = vmReservation.getVolumeReservation();
- if (storage != null) {
- List<Long> volIdList = new ArrayList<Long>(storage.keySet());
- if (volIdList != null && !volIdList.isEmpty()) {
- poolId = storage.get(volIdList.get(0));
- }
- }
-
DataCenterDeployment reservedPlan = new DataCenterDeployment(vm.getDataCenterId(),
vmReservation.getPodId(), vmReservation.getClusterId(), vmReservation.getHostId(), null, null);
try {