CLOUDSTACK-6345: Non gpu enabled VMs are getting deployed in gpu enabled Hosts.

sanjaytripathi · sanjaytripathi · commit 2530bf965888 · 2014-04-07T15:43:46.000+05:30
diff --git a/engine/components-api/src/com/cloud/resource/ResourceManager.java b/engine/components-api/src/com/cloud/resource/ResourceManager.java
@@ -141,6 +141,13 @@ public interface ResourceManager extends ResourceService {
      */
     List<HostVO> listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId);
 
+    /**
+     * Check if host is GPU enabled
+     * @param hostId the host to be checked
+     * @return true if host contains GPU card else false
+     */
+    boolean isHostGpuEnabled(long hostId);
+
     /**
      * Check if host has GPU devices available
      * @param hostId the host to be checked
diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -243,7 +243,7 @@ protected List<Host> allocateTo(DeploymentPlan plan, ServiceOffering offering, V
 
         // We will try to reorder the host lists such that we give priority to hosts that have
         // the minimums to support a VM's requirements
-        hosts = prioritizeHosts(template, hosts);
+        hosts = prioritizeHosts(template, offering, hosts);
 
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Found " + hosts.size() + " hosts for allocation after prioritization: " + hosts);
@@ -353,7 +353,7 @@ public boolean isVirtualMachineUpgradable(VirtualMachine vm, ServiceOffering off
         return true;
     }
 
-    protected List<? extends Host> prioritizeHosts(VMTemplateVO template, List<? extends Host> hosts) {
+    protected List<? extends Host> prioritizeHosts(VMTemplateVO template, ServiceOffering offering, List<? extends Host> hosts) {
         if (template == null) {
             return hosts;
         }
@@ -416,6 +416,22 @@ protected List<? extends Host> prioritizeHosts(VMTemplateVO template, List<? ext
         prioritizedHosts.addAll(0, highPriorityHosts);
         prioritizedHosts.addAll(lowPriorityHosts);
 
+        // if service offering is not GPU enabled then move all the GPU enabled hosts to the end of priority list.
+        if (_serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString()) == null) {
+
+            List<Host> gpuEnabledHosts = new ArrayList<Host>();
+            // Check for GPU enabled hosts.
+            for (Host host : prioritizedHosts) {
+                if (_resourceMgr.isHostGpuEnabled(host.getId())) {
+                    gpuEnabledHosts.add(host);
+                }
+            }
+            // Move GPU enabled hosts to the end of list
+            if(!gpuEnabledHosts.isEmpty()) {
+                prioritizedHosts.removeAll(gpuEnabledHosts);
+                prioritizedHosts.addAll(gpuEnabledHosts);
+            }
+        }
         return prioritizedHosts;
     }
 
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2500,6 +2500,13 @@ public List<HostVO> listAllUpAndEnabledHostsInOneZoneByHypervisor(HypervisorType
         return sc.list();
     }
 
+    @Override
+    public boolean isHostGpuEnabled(long hostId) {
+        SearchCriteria<HostGpuGroupsVO> sc = _gpuAvailability.create();
+        sc.setParameters("hostId", hostId);
+        return _hostGpuGroupsDao.customSearch(sc, null).size() > 0 ? true : false;
+    }
+
     @Override
     public List<HostGpuGroupsVO> listAvailableGPUDevice(long hostId, String vgpuType) {
         if (vgpuType == null) {
diff --git a/server/test/com/cloud/resource/MockResourceManagerImpl.java b/server/test/com/cloud/resource/MockResourceManagerImpl.java
@@ -585,4 +585,10 @@ public HashMap<String, HashMap<String, Long>> getGPUStatistics(HostVO host) {
         // TODO Auto-generated method stub
         return null;
     }
+
+    @Override
+    public boolean isHostGpuEnabled(long hostId) {
+        // TODO Auto-generated method stub
+        return false;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -585,4 +585,10 @@ public HashMap<String, HashMap<String, Long>> getGPUStatistics(HostVO host) {`
`585`	`585`	`// TODO Auto-generated method stub`
`586`	`586`	`return null;`
`587`	`587`	`}`
	`588`	`+`
	`589`	`+ @Override`
	`590`	`+ public boolean isHostGpuEnabled(long hostId) {`
	`591`	`+ // TODO Auto-generated method stub`
	`592`	`+ return false;`
	`593`	`+ }`
`588`	`594`	`}`