From c1f0aef5505ee17c86012fc8f932c4681cbddee8 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Mon, 28 Feb 2011 17:25:52 -0800
Subject: [PATCH] More changes for Bug 7845 - Productize DeploymentPlanner

- After applying the User concentrated Pod heuristic, order of clusters within a pod (based on capacity) should remain intact
- Only change should be clusters of which pod to be considered first
---
 server/src/com/cloud/deploy/FirstFitPlanner.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index 6c07011fc21..aca8251ee4d 100644
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -293,7 +293,11 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
 			if(podClusterMap.containsKey(pod)){
 				List<Long> clustersOfThisPod = (List<Long>)podClusterMap.get(pod);
 				if(clustersOfThisPod != null){
-					reorderedClusters.addAll(clustersOfThisPod);
+					for(Long clusterId : clusterIds){
+						if(clustersOfThisPod.contains(clusterId)){
+							reorderedClusters.add(clusterId);
+						}
+					}
 					clusterIds.removeAll(clustersOfThisPod);
 				}
 			}