cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [39/50] [abbrv] git commit: updated refs/heads/vmware-storage-motion to 406785b
Date Thu, 30 May 2013 11:23:10 GMT
Patch 2: CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster
or host

Patch 2 for https://reviews.apache.org/r/11379/
Created for files server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java, server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java,
server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java


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

Branch: refs/heads/vmware-storage-motion
Commit: 965c7b9c35fc5680b2f35a8c8fed35c1232a643b
Parents: 1726779
Author: Saksham Srivastava <Saksham.Srivastava@citrix.com>
Authored: Thu May 30 01:03:38 2013 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Thu May 30 01:07:07 2013 -0700

----------------------------------------------------------------------
 .../configuration/ConfigurationManagerImpl.java    |    1 +
 .../deploy/DeploymentPlanningManagerImpl.java      |   60 ++++++++++++++-
 .../vm/DeploymentPlanningManagerImplTest.java      |    9 ++
 .../cloudstack/affinity/AffinityApiUnitTest.java   |   10 +++
 4 files changed, 79 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/965c7b9c/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 52c5e2e..59e70cf 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -109,6 +109,7 @@ import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.DataCenterIpAddressDao;
 import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao;
 import com.cloud.dc.dao.DcDetailsDao;
+import com.cloud.dc.dao.DedicatedResourceDao;
 import com.cloud.dc.dao.HostPodDao;
 import com.cloud.dc.dao.PodVlanMapDao;
 import com.cloud.dc.dao.VlanDao;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/965c7b9c/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 795b526..d954c8b 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -30,6 +30,7 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
+import org.apache.cloudstack.affinity.AffinityGroupVMMapVO;
 
 import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
@@ -53,9 +54,12 @@ import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.DedicatedResourceVO;
+import com.cloud.dc.HostPodVO;
 import com.cloud.dc.Pod;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.DedicatedResourceDao;
 import com.cloud.dc.dao.HostPodDao;
 import com.cloud.deploy.DeploymentPlanner.ExcludeList;
 import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage;
@@ -91,6 +95,7 @@ import com.cloud.utils.component.Manager;
 import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
+import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.DiskProfile;
 import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VMInstanceVO;
@@ -157,6 +162,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
     @Inject protected HostDao _hostDao;
     @Inject protected HostPodDao _podDao;
     @Inject protected ClusterDao _clusterDao;
+    @Inject protected DedicatedResourceDao _dedicatedDao;
     @Inject protected GuestOSDao _guestOSDao = null;
     @Inject protected GuestOSCategoryDao _guestOSCategoryDao = null;
     @Inject protected DiskOfferingDao _diskOfferingDao;
@@ -196,6 +202,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
         // call affinitygroup chain
         VirtualMachine vm = vmProfile.getVirtualMachine();
         long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId());
+        DataCenter dc = _dcDao.findById(vm.getDataCenterId());
 
         if (vmGroupCount > 0) {
             for (AffinityGroupProcessor processor : _affinityProcessors) {
@@ -203,13 +210,14 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
             }
         }
 
+        checkForNonDedicatedResources(vm, dc, avoids);
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Deploy avoids pods: " + avoids.getPodsToAvoid() + ", clusters:
"
                     + avoids.getClustersToAvoid() + ", hosts: " + avoids.getHostsToAvoid());
         }
 
         // call planners
-        DataCenter dc = _dcDao.findById(vm.getDataCenterId());
+        //DataCenter dc = _dcDao.findById(vm.getDataCenterId());
         // check if datacenter is in avoid set
         if (avoids.shouldAvoid(dc)) {
             if (s_logger.isDebugEnabled()) {
@@ -430,6 +438,56 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
         return dest;
     }
 
+    private void checkForNonDedicatedResources(VirtualMachine vm, DataCenter dc, ExcludeList
avoids) {
+        boolean isExplicit = false;
+        // check affinity group of type Explicit dedication exists
+        List<AffinityGroupVMMapVO> vmGroupMappings = _affinityGroupVMMapDao.findByVmIdType(vm.getId(),
"ExplicitDedication");
+
+        if (vmGroupMappings != null && !vmGroupMappings.isEmpty()){
+            isExplicit = true;
+        }
+
+        if (!isExplicit && vm.getType() == VirtualMachine.Type.User) {
+            //add explicitly dedicated resources in avoidList
+            DedicatedResourceVO dedicatedZone = _dedicatedDao.findByZoneId(dc.getId());
+            if (dedicatedZone != null) {
+                throw new CloudRuntimeException("Failed to deploy VM. Zone " + dc.getName()
+ " is dedicated.");
+            }
+
+            List<HostPodVO> podsInDc = _podDao.listByDataCenterId(dc.getId());
+            for (HostPodVO pod : podsInDc) {
+                DedicatedResourceVO dedicatedPod = _dedicatedDao.findByPodId(pod.getId());
+                if (dedicatedPod != null) {
+                    avoids.addPod(dedicatedPod.getPodId());
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("Cannot use this dedicated pod " + pod.getName() +
".");
+                    }
+                }
+            }
+
+            List<ClusterVO> clusterInDc = _clusterDao.listClustersByDcId(dc.getId());
+            for (ClusterVO cluster : clusterInDc) {
+                DedicatedResourceVO dedicatedCluster = _dedicatedDao.findByClusterId(cluster.getId());
+                if (dedicatedCluster != null) {
+                    avoids.addCluster(dedicatedCluster.getClusterId());
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("Cannot use this dedicated Cluster " + cluster.getName()
+ ".");
+                    }
+                }
+            }
+            List<HostVO> hostInDc = _hostDao.listByDataCenterId(dc.getId());
+            for (HostVO host : hostInDc) {
+                DedicatedResourceVO dedicatedHost = _dedicatedDao.findByHostId(host.getId());
+                if (dedicatedHost != null) {
+                    avoids.addHost(dedicatedHost.getHostId());
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("Cannot use this dedicated host " + host.getName()
+ ".");
+                    }
+                }
+            }
+        }
+    }
+
     private void resetAvoidSet(ExcludeList avoidSet, ExcludeList removeSet) {
         if (avoidSet.getDataCentersToAvoid() != null && removeSet.getDataCentersToAvoid()
!= null) {
             avoidSet.getDataCentersToAvoid().removeAll(removeSet.getDataCentersToAvoid());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/965c7b9c/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
index e3b7d31..442c2be 100644
--- a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
+++ b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
@@ -40,6 +40,7 @@ import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.DedicatedResourceDao;
 import com.cloud.dc.dao.HostPodDao;
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeployDestination;
@@ -113,6 +114,9 @@ public class DeploymentPlanningManagerImplTest {
     @Inject
     ClusterDao _clusterDao;
 
+    @Inject
+    DedicatedResourceDao _dedicatedDao;
+
     private static long domainId = 5L;
 
     private static long dataCenterId = 1L;
@@ -252,6 +256,11 @@ public class DeploymentPlanningManagerImplTest {
         }
 
         @Bean
+        public DedicatedResourceDao dedicatedResourceDao() {
+            return Mockito.mock(DedicatedResourceDao.class);
+        }
+
+        @Bean
         public GuestOSDao guestOSDao() {
             return Mockito.mock(GuestOSDao.class);
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/965c7b9c/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
index 24c5d3d..5816b28 100644
--- a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
+++ b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
@@ -52,6 +52,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.cloud.dc.dao.DedicatedResourceDao;
 import com.cloud.event.EventUtils;
 import com.cloud.event.EventVO;
 import com.cloud.event.dao.EventDao;
@@ -105,6 +106,10 @@ public class AffinityApiUnitTest {
     @Inject
     EventDao _eventDao;
 
+    @Inject
+    DedicatedResourceDao _dedicatedDao;
+
+
     private static long domainId = 5L;
 
 
@@ -219,6 +224,11 @@ public class AffinityApiUnitTest {
         }
 
         @Bean
+        public DedicatedResourceDao dedicatedResourceDao() {
+            return Mockito.mock(DedicatedResourceDao.class);
+        }
+
+        @Bean
         public AccountManager accountManager() {
             return Mockito.mock(AccountManager.class);
         }


Mime
View raw message