Skip to content

[WIP] Add extra hypervisor to the avoid list when affinity group #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
remibergsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Add extra hypervisor to the avoid list when affinity group #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions ...essors/host-anti-affinity/src/main/java/com/cloud/affinity/HostAntiAffinityProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
import com.cloud.affinity.dao.AffinityGroupDao;
import com.cloud.affinity.dao.AffinityGroupVMMapDao;
import com.cloud.configuration.Config;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.dao.ClusterDao;
import com.cloud.deploy.DeployDestination;
import com.cloud.deploy.DeploymentPlan;
import com.cloud.deploy.DeploymentPlanner.ExcludeList;
import com.cloud.engine.cloud.entity.api.db.VMReservationVO;
import com.cloud.engine.cloud.entity.api.db.dao.VMReservationDao;
import com.cloud.exception.AffinityConflictException;
import com.cloud.framework.config.dao.ConfigurationDao;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.vm.VMInstanceVO;
Expand Down Expand Up @@ -42,6 +46,11 @@ public class HostAntiAffinityProcessor extends AffinityProcessorBase implements
@Inject
protected VMReservationDao _reservationDao;
private int _vmCapacityReleaseInterval;
@Inject
protected HostDao _hostDao;
@Inject
protected ClusterDao _clusterDao;


@Override
public void process(final VirtualMachineProfile vmProfile, final DeploymentPlan plan, final ExcludeList avoid) throws AffinityConflictException {
Expand Down Expand Up @@ -81,6 +90,38 @@ public void process(final VirtualMachineProfile vmProfile, final DeploymentPlan
}
}
}

// Add a random host to the avoid list to get N+1 in case of affinity groups
if (vmGroupMappings.size() > 0) {
// cluster in plan
if (plan.getClusterId() != null) {
final long clusterId = plan.getClusterId();
final ClusterVO cluster = _clusterDao.findById(clusterId);
final List<HostVO> hosts = _hostDao.findByClusterId(clusterId);

for (final HostVO host : hosts) {
if (!avoid.getHostsToAvoid().contains(host.getId())) {
s_logger.debug("Need to maintain N+1 on cluster " + cluster.getName() + ", so adding host " + host.getName() + " to the avoid set.");
avoid.addHost(host.getId());
break;
}
}
// pod in plan
} else if (plan.getPodId() != null) {
List<ClusterVO> clusters = _clusterDao.listByPodId(plan.getPodId());
for (final ClusterVO cluster : clusters) {
List<HostVO> hosts = _hostDao.findByClusterId(cluster.getId());

for (final HostVO host : hosts) {
if (!avoid.getHostsToAvoid().contains(host.getId())) {
avoid.addHost(host.getId());
s_logger.debug("Need to maintain N+1 on cluster " + cluster.getName() + ", so adding host " + host.getName() + " to the avoid set.");
break;
}
}
}
}
}
}

@Override
Expand Down