etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.13' into 4.14

This commit is contained in:
Rohit Yadav 2020-07-07 12:51:46 +05:30
parent b64d0b2d92 4da374b6b4
commit b141b8e256
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/components-api/src/main/java/com/cloud/deploy/DeploymentPlanningManager.java
View File

@ -16,6 +16,7 @@
// under the License. // under the License.
package com.cloud.deploy; package com.cloud.deploy;
import com.cloud.dc.DataCenter;
import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.deploy.DeploymentPlanner.ExcludeList;
import com.cloud.exception.AffinityConflictException; import com.cloud.exception.AffinityConflictException;
import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.exception.InsufficientServerCapacityException;
@ -49,4 +50,6 @@ public interface DeploymentPlanningManager extends Manager {
void cleanupVMReservations(); void cleanupVMReservations();
DeploymentPlanner getDeploymentPlannerByName(String plannerName); DeploymentPlanner getDeploymentPlannerByName(String plannerName);
void checkForNonDedicatedResources(VirtualMachineProfile vmProfile, DataCenter dc, ExcludeList avoids);
} }

6
server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
View File

@ -362,9 +362,6 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
} }
} }
if (vm.getType() == VirtualMachine.Type.User) {
checkForNonDedicatedResources(vmProfile, dc, avoids);
}
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("Deploy avoids pods: " + avoids.getPodsToAvoid() + ", clusters: " + avoids.getClustersToAvoid() + ", hosts: " + avoids.getHostsToAvoid()); s_logger.debug("Deploy avoids pods: " + avoids.getPodsToAvoid() + ", clusters: " + avoids.getClustersToAvoid() + ", hosts: " + avoids.getHostsToAvoid());
} }
@ -572,7 +569,8 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
return null; return null;
} }
private void checkForNonDedicatedResources(VirtualMachineProfile vmProfile, DataCenter dc, ExcludeList avoids) { @Override
public void checkForNonDedicatedResources(VirtualMachineProfile vmProfile, DataCenter dc, ExcludeList avoids) {
boolean isExplicit = false; boolean isExplicit = false;
VirtualMachine vm = vmProfile.getVirtualMachine(); VirtualMachine vm = vmProfile.getVirtualMachine();

5
server/src/main/java/com/cloud/server/ManagementServerImpl.java
View File

@ -1343,6 +1343,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
} }
} }
if (vm.getType() == VirtualMachine.Type.User || vm.getType() == VirtualMachine.Type.DomainRouter) {
final DataCenterVO dc = _dcDao.findById(srcHost.getDataCenterId());
_dpMgr.checkForNonDedicatedResources(vmProfile, dc, excludes);
}
for (final HostAllocator allocator : hostAllocators) { for (final HostAllocator allocator : hostAllocators) {
if (canMigrateWithStorage) { if (canMigrateWithStorage) {
suitableHosts = allocator.allocateTo(vmProfile, plan, Host.Type.Routing, excludes, allHosts, HostAllocator.RETURN_UPTO_ALL, false); suitableHosts = allocator.allocateTo(vmProfile, plan, Host.Type.Routing, excludes, allHosts, HostAllocator.RETURN_UPTO_ALL, false);