Skip to content

Only use the host if its Resource State is Enabled. #2512

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

Merged
DaanHoogland merged 1 commit into from
Mar 29, 2018
Merged

Only use the host if its Resource State is Enabled. #2512

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion .../datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import com.cloud.host.dao.HostDao;
import com.cloud.host.dao.HostDetailsDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceState;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.Snapshot;
Expand Down Expand Up @@ -1933,7 +1934,11 @@ private HostVO getHostInCluster(long clusterId) {
if (hosts != null && hosts.size() > 0) {
Collections.shuffle(hosts, RANDOM);

return hosts.get(0);
for (HostVO host : hosts) {
if (ResourceState.Enabled.equals(host.getResourceState())) {
return host;
}
}
}

throw new CloudRuntimeException("Unable to locate a host");
Expand All @@ -1954,6 +1959,10 @@ private HostVO getHost(Long zoneId, HypervisorType hypervisorType, boolean compu
Collections.shuffle(hosts, RANDOM);

for (HostVO host : hosts) {
if (!ResourceState.Enabled.equals(host.getResourceState())) {
continue;
}

if (computeClusterMustSupportResign) {
long clusterId = host.getClusterId();

Expand Down
33 changes: 12 additions & 21 deletions ...ge/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventUtils;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
Expand Down Expand Up @@ -56,7 +55,6 @@
import com.cloud.vm.snapshot.VMSnapshotService;
import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;

import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
Expand Down Expand Up @@ -86,6 +84,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.UUID;

Expand All @@ -102,14 +101,14 @@ public class StorageSystemSnapshotStrategy extends SnapshotStrategyBase {
@Inject private SnapshotDao snapshotDao;
@Inject private SnapshotDataFactory snapshotDataFactory;
@Inject private SnapshotDetailsDao snapshotDetailsDao;
@Inject SnapshotDataStoreDao snapshotStoreDao;
@Inject private SnapshotDataStoreDao snapshotStoreDao;
@Inject private VolumeDetailsDao volumeDetailsDao;
@Inject private VMInstanceDao vmInstanceDao;
@Inject private VMSnapshotDao vmSnapshotDao;
@Inject private VMSnapshotService vmSnapshotService;
@Inject private VolumeDao volumeDao;
@Inject private VolumeService volService;
@Inject private VolumeDetailsDao _volumeDetailsDaoImpl;
@Inject private VolumeDetailsDao volumeDetailsDaoImpl;

@Override
public SnapshotInfo backupSnapshot(SnapshotInfo snapshotInfo) {
Expand Down Expand Up @@ -200,7 +199,7 @@ private boolean cleanupSnapshotOnPrimaryStore(long snapshotId) {
try {
snapshotObj.processEvent(Snapshot.Event.DestroyRequested);

List<VolumeDetailVO> volumesFromSnapshot = _volumeDetailsDaoImpl.findDetails("SNAPSHOT_ID", String.valueOf(snapshotId), null);
List<VolumeDetailVO> volumesFromSnapshot = volumeDetailsDaoImpl.findDetails("SNAPSHOT_ID", String.valueOf(snapshotId), null);

if (volumesFromSnapshot.size() > 0) {
try {
Expand Down Expand Up @@ -471,20 +470,11 @@ else if (volumeInfo.getFormat() == ImageFormat.OVA || volumeInfo.getFormat() ==
if (ImageFormat.OVA.equals(volumeInfo.getFormat())) {
setVmdk(snapshotInfo, volumeInfo);

try {
vmSnapshot = takeHypervisorSnapshot(volumeInfo);
}
catch (ResourceAllocationException ex) {
String errMsg = "Unable to allocate VM snapshot";

s_logger.error(errMsg, ex);

throw new CloudRuntimeException(errMsg, ex);
}
vmSnapshot = takeHypervisorSnapshot(volumeInfo);
}

SnapshotResult result = null;
SnapshotInfo snapshotOnPrimary = null;
SnapshotInfo snapshotOnPrimary;

try {
volumeInfo.stateTransit(Volume.Event.SnapshotRequested);
Expand Down Expand Up @@ -549,7 +539,7 @@ public void postSnapshotCreation(SnapshotInfo snapshot) {

}

private VMSnapshot takeHypervisorSnapshot(VolumeInfo volumeInfo) throws ResourceAllocationException {
private VMSnapshot takeHypervisorSnapshot(VolumeInfo volumeInfo) {
VirtualMachine virtualMachine = volumeInfo.getAttachedVM();

if (virtualMachine != null && VirtualMachine.State.Running.equals(virtualMachine.getState())) {
Expand Down Expand Up @@ -678,7 +668,8 @@ private void performSnapshotAndCopyOnHostSide(VolumeInfo volumeInfo, SnapshotInf
if (hostId != null) {
hostVO = hostDao.findById(hostId);
}
else {

if (hostVO == null || !ResourceState.Enabled.equals(hostVO.getResourceState())) {
Optional<HostVO> optHostVO = getHost(volumeInfo.getDataCenterId(), false);

if (optHostVO.isPresent()) {
Expand Down Expand Up @@ -836,7 +827,7 @@ private HostVO getHost(long zoneId, Long hostId) {

HostVO hostVO = hostDao.findById(hostId);

if (hostVO != null) {
if (hostVO != null && ResourceState.Enabled.equals(hostVO.getResourceState())) {
return hostVO;
}

Expand Down Expand Up @@ -867,7 +858,7 @@ private Optional<HostVO> getHost(long zoneId, boolean computeClusterMustSupportR
Collections.shuffle(hosts, new Random(System.nanoTime()));

for (HostVO host : hosts) {
if (host.getResourceState() == ResourceState.Enabled) {
if (ResourceState.Enabled.equals(host.getResourceState())) {
if (computeClusterMustSupportResign) {
if (clusterDao.getSupportsResigning(cluster.getId())) {
return Optional.of(host);
Expand All @@ -886,7 +877,7 @@ private Optional<HostVO> getHost(long zoneId, boolean computeClusterMustSupportR
}
}

return Optional.absent();
return Optional.empty();
}

private void markAsBackedUp(SnapshotObject snapshotObj) {
Expand Down