apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 02:53:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4234:Dedicated Resources: When multiple dedication groups are chosen for VM deployment, dedicated resources belonging to both groups should be considered

Browse Source 
Changes:
- Do not add the dedicated resource to avoid list if it is present in the list of resources to consider for the deployment.
This commit is contained in:
Prachi Damle 2013-08-10 12:11:56 -07:00
parent 2ce2552132
commit 25cc9eb869
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
View File

@ -277,7 +277,7 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
List<HostVO> hostList = _hostDao.findByClusterId(dr.getClusterId()); List<HostVO> hostList = _hostDao.findByClusterId(dr.getClusterId());
for (HostVO host : hostList) { for (HostVO host : hostList) {
DedicatedResourceVO dHost = _dedicatedDao.findByHostId(host.getId()); DedicatedResourceVO dHost = _dedicatedDao.findByHostId(host.getId());
if (dHost != null) { if (dHost != null && !dedicatedResources.contains(dHost)) {
avoidList.addHost(host.getId()); avoidList.addHost(host.getId());
} else { } else {
includeList.addHost(host.getId()); includeList.addHost(host.getId());
@ -292,7 +292,8 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
//add all cluster under this pod in includeList //add all cluster under this pod in includeList
List<ClusterVO> clusterList = _clusterDao.listByPodId(dr.getPodId()); List<ClusterVO> clusterList = _clusterDao.listByPodId(dr.getPodId());
for (ClusterVO cluster : clusterList) { for (ClusterVO cluster : clusterList) {
if (_dedicatedDao.findByClusterId(cluster.getId()) != null) { DedicatedResourceVO dCluster = _dedicatedDao.findByClusterId(cluster.getId());
if (dCluster != null && !dedicatedResources.contains(dCluster)) {
avoidList.addCluster(cluster.getId()); avoidList.addCluster(cluster.getId());
} else { } else {
includeList.addCluster(cluster.getId()); includeList.addCluster(cluster.getId());
@ -301,7 +302,8 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
//add all hosts inside this pod in includeList //add all hosts inside this pod in includeList
List<HostVO> hostList = _hostDao.findByPodId(dr.getPodId()); List<HostVO> hostList = _hostDao.findByPodId(dr.getPodId());
for (HostVO host : hostList) { for (HostVO host : hostList) {
if (_dedicatedDao.findByHostId(host.getId()) != null) { DedicatedResourceVO dHost = _dedicatedDao.findByHostId(host.getId());
if (dHost != null && !dedicatedResources.contains(dHost)) {
avoidList.addHost(host.getId()); avoidList.addHost(host.getId());
} else { } else {
includeList.addHost(host.getId()); includeList.addHost(host.getId());
@ -314,7 +316,8 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
//add all Pod under this data center in includeList //add all Pod under this data center in includeList
List<HostPodVO> podList = _podDao.listByDataCenterId(dr.getDataCenterId()); List<HostPodVO> podList = _podDao.listByDataCenterId(dr.getDataCenterId());
for (HostPodVO pod : podList) { for (HostPodVO pod : podList) {
if (_dedicatedDao.findByPodId(pod.getId()) != null) { DedicatedResourceVO dPod = _dedicatedDao.findByPodId(pod.getId());
if (dPod != null && !dedicatedResources.contains(dPod)) {
avoidList.addPod(pod.getId()); avoidList.addPod(pod.getId());
} else { } else {
includeList.addPod(pod.getId()); includeList.addPod(pod.getId());
@ -322,7 +325,8 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
} }
List<ClusterVO> clusterList = _clusterDao.listClustersByDcId(dr.getDataCenterId()); List<ClusterVO> clusterList = _clusterDao.listClustersByDcId(dr.getDataCenterId());
for (ClusterVO cluster : clusterList) { for (ClusterVO cluster : clusterList) {
if (_dedicatedDao.findByClusterId(cluster.getId()) != null) { DedicatedResourceVO dCluster = _dedicatedDao.findByClusterId(cluster.getId());
if (dCluster != null && !dedicatedResources.contains(dCluster)) {
avoidList.addCluster(cluster.getId()); avoidList.addCluster(cluster.getId());
} else { } else {
includeList.addCluster(cluster.getId()); includeList.addCluster(cluster.getId());
@ -331,7 +335,8 @@ public class ExplicitDedicationProcessor extends AffinityProcessorBase implement
//add all hosts inside this in includeList //add all hosts inside this in includeList
List<HostVO> hostList = _hostDao.listByDataCenterId(dr.getDataCenterId()); List<HostVO> hostList = _hostDao.listByDataCenterId(dr.getDataCenterId());
for (HostVO host : hostList) { for (HostVO host : hostList) {
if (_dedicatedDao.findByHostId(host.getId()) != null) { DedicatedResourceVO dHost = _dedicatedDao.findByHostId(host.getId());
if (dHost != null && !dedicatedResources.contains(dHost)) {
avoidList.addHost(host.getId()); avoidList.addHost(host.getId());
} else { } else {
includeList.addHost(host.getId()); includeList.addHost(host.getId());