You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2018/03/07 21:23:16 UTC
[GitHub] rafaelweingartner closed pull request #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage
rafaelweingartner closed pull request #2425: [CLOUDSTACK-10240] ACS cannot migrate a local volume to shared storage
URL: https://github.com/apache/cloudstack/pull/2425
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.travis.yml b/.travis.yml
index d5fd173d71e..be0bfb12210 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,9 +70,10 @@ env:
smoke/test_password_server
smoke/test_portable_publicip
smoke/test_portforwardingrules"
-
- - TESTS="smoke/test_primary_storage
- smoke/test_privategw_acl
+
+ - TESTS="smoke/test_primary_storage"
+
+ - TESTS="smoke/test_privategw_acl
smoke/test_projects
smoke/test_public_ip_range
smoke/test_pvlan
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
index 47fa965e7dd..73c596c9e56 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
@@ -17,10 +17,10 @@
package org.apache.cloudstack.api.command.admin.storage;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -29,12 +29,14 @@
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
import com.cloud.storage.StoragePool;
import com.cloud.utils.Pair;
@APICommand(name = "findStoragePoolsForMigration", description = "Lists storage pools available for migration of a volume.", responseObject = StoragePoolResponse.class,
- requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName());
@@ -81,7 +83,7 @@ public void execute() {
StoragePoolResponse poolResponse = _responseGenerator.createStoragePoolForMigrationResponse(pool);
Boolean suitableForMigration = false;
for (StoragePool suitablePool : suitablePoolList) {
- if (suitablePool.getId() == pool.getId()) {
+ if (StringUtils.equals(suitablePool.getUuid(), pool.getUuid())) {
suitableForMigration = true;
break;
}
@@ -90,9 +92,27 @@ public void execute() {
poolResponse.setObjectName("storagepool");
poolResponses.add(poolResponse);
}
-
+ sortPoolsBySuitabilityAndName(poolResponses);
response.setResponses(poolResponses);
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
+
+ protected void sortPoolsBySuitabilityAndName(List<StoragePoolResponse> poolResponses) {
+ Collections.sort(poolResponses, new Comparator<StoragePoolResponse>() {
+ @Override
+ public int compare(StoragePoolResponse o1, StoragePoolResponse o2) {
+ if (o1.getSuitableForMigration() && o2.getSuitableForMigration()) {
+ return o1.getName().compareTo(o2.getName());
+ }
+ if (o1.getSuitableForMigration()) {
+ return -1;
+ }
+ if (o2.getSuitableForMigration()) {
+ return 1;
+ }
+ return 0;
+ }
+ });
+ }
}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java
new file mode 100644
index 00000000000..2297946bec7
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmdTest.java
@@ -0,0 +1,63 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.storage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.cloudstack.api.response.StoragePoolResponse;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class FindStoragePoolsForMigrationCmdTest {
+
+ private FindStoragePoolsForMigrationCmd findStoragePoolsForMigrationCmd = new FindStoragePoolsForMigrationCmd();
+
+ @Test
+ public void sortPoolsBySuitability() {
+ List<StoragePoolResponse> storagePoolsResponse = new ArrayList<>();
+ StoragePoolResponse storagePoolResponse1 = new StoragePoolResponse();
+ storagePoolResponse1.setSuitableForMigration(true);
+ storagePoolResponse1.setId("1");
+ storagePoolResponse1.setName("1");
+
+ StoragePoolResponse storagePoolResponse2 = new StoragePoolResponse();
+ storagePoolResponse2.setSuitableForMigration(false);
+ storagePoolResponse2.setId("2");
+ storagePoolResponse2.setName("2");
+
+ StoragePoolResponse storagePoolResponse3 = new StoragePoolResponse();
+ storagePoolResponse3.setSuitableForMigration(true);
+ storagePoolResponse3.setId("3");
+ storagePoolResponse3.setName("3");
+
+ storagePoolsResponse.add(storagePoolResponse3);
+ storagePoolsResponse.add(storagePoolResponse2);
+ storagePoolsResponse.add(storagePoolResponse1);
+
+ findStoragePoolsForMigrationCmd.sortPoolsBySuitabilityAndName(storagePoolsResponse);
+
+ Assert.assertEquals("1", storagePoolsResponse.get(0).getId());
+ Assert.assertEquals("3", storagePoolsResponse.get(1).getId());
+ Assert.assertEquals("2", storagePoolsResponse.get(2).getId());
+
+ }
+
+}
\ No newline at end of file
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 375b0910624..fb1c1b41933 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -23,9 +23,9 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -39,9 +39,6 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
import org.apache.cloudstack.ca.CAManager;
import org.apache.cloudstack.context.CallContext;
@@ -73,6 +70,9 @@
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
@@ -424,8 +424,9 @@ public void doInTransactionWithoutResult(final TransactionStatus status) throws
}
try {
- if (!vmProfile.getBootArgs().contains("ExternalLoadBalancerVm"))
+ if (!vmProfile.getBootArgs().contains("ExternalLoadBalancerVm")) {
_networkMgr.allocate(vmProfile, auxiliaryNetworks, extraDhcpOptions);
+ }
} catch (final ConcurrentOperationException e) {
throw new CloudRuntimeException("Concurrent operation while trying to allocate resources for the VM", e);
}
@@ -1880,6 +1881,7 @@ public void destroy(final String vmUuid, final boolean expunge) throws AgentUnav
deleteVMSnapshots(vm, expunge);
Transaction.execute(new TransactionCallbackWithExceptionNoReturn<CloudRuntimeException>() {
+ @Override
public void doInTransactionWithoutResult(final TransactionStatus status) throws CloudRuntimeException {
VMInstanceVO vm = _vmDao.findByUuid(vmUuid);
try {
@@ -2292,97 +2294,119 @@ protected void migrate(final VMInstanceVO vm, final long srcHostId, final Deploy
}
}
- private Map<Volume, StoragePool> getPoolListForVolumesForMigration(final VirtualMachineProfile profile, final Host host, final Map<Long, Long> volumeToPool) {
- final List<VolumeVO> allVolumes = _volsDao.findUsableVolumesForInstance(profile.getId());
- final Map<Volume, StoragePool> volumeToPoolObjectMap = new HashMap<>();
-
- for (final VolumeVO volume : allVolumes) {
- final Long poolId = volumeToPool.get(volume.getId());
- final StoragePoolVO destPool = _storagePoolDao.findById(poolId);
- final StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId());
- final DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId());
-
- if (destPool != null) {
- if (currentPool.isManaged()) {
- if (destPool.getId() == currentPool.getId()) {
- volumeToPoolObjectMap.put(volume, currentPool);
- }
- else {
- throw new CloudRuntimeException("Currently, a volume on managed storage can only be 'migrated' to itself.");
- }
- }
- else {
- // Check if pool is accessible from the destination host and disk offering with which the volume was
- // created is compliant with the pool type.
- if (_poolHostDao.findByPoolHost(destPool.getId(), host.getId()) == null || destPool.isLocal() != diskOffering.getUseLocalStorage()) {
- // Cannot find a pool for the volume. Throw an exception.
- throw new CloudRuntimeException("Cannot migrate volume " + volume + " to storage pool " + destPool + " while migrating vm to host " + host +
- ". Either the pool is not accessible from the host or because of the offering with which the volume is created it cannot be placed on " +
- "the given pool.");
- } else if (destPool.getId() == currentPool.getId()) {
- // If the pool to migrate to is the same as current pool, the volume doesn't need to be migrated.
- } else {
- volumeToPoolObjectMap.put(volume, destPool);
- }
- }
- } else {
- if (currentPool.isManaged()) {
- if (currentPool.getScope() == ScopeType.ZONE) {
- volumeToPoolObjectMap.put(volume, currentPool);
- }
- else {
- throw new CloudRuntimeException("Currently, you can only 'migrate' a volume on managed storage if its storage pool is zone wide.");
- }
- } else {
- // Find a suitable pool for the volume. Call the storage pool allocator to find the list of pools.
-
- final DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType());
- final DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(),
- host.getId(), null, null);
+ /**
+ * Create the mapping of volumes and storage pools. If the user did not enter a mapping on her/his own, we create one using {@link #getDefaultMappingOfVolumesAndStoragePoolForMigration(VirtualMachineProfile, Host)}.
+ * If the user provided a mapping, we use whatever the user has provided (check the method {@link #createMappingVolumeAndStoragePoolEnteredByUser(VirtualMachineProfile, Host, Map)}).
+ */
+ private Map<Volume, StoragePool> getPoolListForVolumesForMigration(VirtualMachineProfile profile, Host targetHost, Map<Long, Long> volumeToPool) {
+ if (MapUtils.isEmpty(volumeToPool)) {
+ return getDefaultMappingOfVolumesAndStoragePoolForMigration(profile, targetHost);
+ }
- final List<StoragePool> poolList = new ArrayList<>();
- final ExcludeList avoid = new ExcludeList();
+ return createMappingVolumeAndStoragePoolEnteredByUser(profile, targetHost, volumeToPool);
+ }
- for (final StoragePoolAllocator allocator : _storagePoolAllocators) {
- final List<StoragePool> poolListFromAllocator = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL);
+ /**
+ * We create the mapping of volumes and storage pool to migrate the VMs according to the information sent by the user.
+ */
+ private Map<Volume, StoragePool> createMappingVolumeAndStoragePoolEnteredByUser(VirtualMachineProfile profile, Host host, Map<Long, Long> volumeToPool) {
+ Map<Volume, StoragePool> volumeToPoolObjectMap = new HashMap<Volume, StoragePool>();
+ for(Long volumeId: volumeToPool.keySet()) {
+ VolumeVO volume = _volsDao.findById(volumeId);
- if (poolListFromAllocator != null && !poolListFromAllocator.isEmpty()) {
- poolList.addAll(poolListFromAllocator);
- }
- }
+ Long poolId = volumeToPool.get(volumeId);
+ StoragePoolVO targetPool = _storagePoolDao.findById(poolId);
+ StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId());
- boolean currentPoolAvailable = false;
+ if (_poolHostDao.findByPoolHost(targetPool.getId(), host.getId()) == null) {
+ throw new CloudRuntimeException(String.format("Cannot migrate the volume [%s] to the storage pool [%s] while migrating VM [%s] to target host [%s]. The host does not have access to the storage pool entered.", volume.getUuid(), targetPool.getUuid(), profile.getUuid(), host.getUuid()));
+ }
+ if (currentPool.getId() == targetPool.getId()) {
+ s_logger.info(String.format("The volume [%s] is already allocated in storage pool [%s].", volume.getUuid(), targetPool.getUuid()));
+ }
+ volumeToPoolObjectMap.put(volume, targetPool);
+ }
+ return volumeToPoolObjectMap;
+ }
- if (poolList != null && !poolList.isEmpty()) {
- // Volume needs to be migrated. Pick the first pool from the list. Add a mapping to migrate the
- // volume to a pool only if it is required; that is the current pool on which the volume resides
- // is not available on the destination host.
+ /**
+ * We create the default mapping of volumes and storage pools for the migration of the VM to the target host.
+ * If the current storage pool of one of the volumes is using local storage in the host, it then needs to be migrated to a local storage in the target host.
+ * Otherwise, we do not need to migrate, and the volume can be kept in its current storage pool.
+ */
+ private Map<Volume, StoragePool> getDefaultMappingOfVolumesAndStoragePoolForMigration(VirtualMachineProfile profile, Host targetHost) {
+ Map<Volume, StoragePool> volumeToPoolObjectMap = new HashMap<Volume, StoragePool>();
+ List<VolumeVO> allVolumes = _volsDao.findUsableVolumesForInstance(profile.getId());
+ for (VolumeVO volume : allVolumes) {
+ StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId());
+ if (ScopeType.HOST.equals(currentPool.getScope())) {
+ createVolumeToStoragePoolMappingIfNeeded(profile, targetHost, volumeToPoolObjectMap, volume, currentPool);
+ } else {
+ volumeToPoolObjectMap.put(volume, currentPool);
+ }
+ }
+ return volumeToPoolObjectMap;
+ }
- final Iterator<StoragePool> iter = poolList.iterator();
+ /**
+ * We will add a mapping of volume to storage pool if needed. The conditions to add a mapping are the following:
+ * <ul>
+ * <li> The current storage pool where the volume is allocated can be accessed by the target host
+ * <li> If not storage pool is found to allocate the volume we throw an exception.
+ * </ul>
+ *
+ */
+ private void createVolumeToStoragePoolMappingIfNeeded(VirtualMachineProfile profile, Host targetHost, Map<Volume, StoragePool> volumeToPoolObjectMap, VolumeVO volume, StoragePoolVO currentPool) {
+ List<StoragePool> poolList = getCandidateStoragePoolsToMigrateLocalVolume(profile, targetHost, volume);
+
+ Collections.shuffle(poolList);
+ boolean canTargetHostAccessVolumeStoragePool = false;
+ for (StoragePool storagePool : poolList) {
+ if (storagePool.getId() == currentPool.getId()) {
+ canTargetHostAccessVolumeStoragePool = true;
+ break;
+ }
- while (iter.hasNext()) {
- if (currentPool.getId() == iter.next().getId()) {
- currentPoolAvailable = true;
+ }
+ if(!canTargetHostAccessVolumeStoragePool && CollectionUtils.isEmpty(poolList)) {
+ throw new CloudRuntimeException(String.format("There is not storage pools avaliable at the target host [%s] to migrate volume [%s]", targetHost.getUuid(), volume.getUuid()));
+ }
+ if (!canTargetHostAccessVolumeStoragePool) {
+ volumeToPoolObjectMap.put(volume, _storagePoolDao.findByUuid(poolList.get(0).getUuid()));
+ }
+ if (!canTargetHostAccessVolumeStoragePool && !volumeToPoolObjectMap.containsKey(volume)) {
+ throw new CloudRuntimeException(String.format("Cannot find a storage pool which is available for volume [%s] while migrating virtual machine [%s] to host [%s]", volume.getUuid(),
+ profile.getUuid(), targetHost.getUuid()));
+ }
+ }
- break;
- }
- }
+ /**
+ * We use {@link StoragePoolAllocator} objects to find local storage pools connected to the targetHost where we would be able to allocate the given volume.
+ */
+ private List<StoragePool> getCandidateStoragePoolsToMigrateLocalVolume(VirtualMachineProfile profile, Host targetHost, VolumeVO volume) {
+ List<StoragePool> poolList = new ArrayList<>();
- if (!currentPoolAvailable) {
- volumeToPoolObjectMap.put(volume, _storagePoolDao.findByUuid(poolList.get(0).getUuid()));
- }
- }
+ DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId());
+ DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType());
+ DataCenterDeployment plan = new DataCenterDeployment(targetHost.getDataCenterId(), targetHost.getPodId(), targetHost.getClusterId(), targetHost.getId(), null, null);
+ ExcludeList avoid = new ExcludeList();
- if (!currentPoolAvailable && !volumeToPoolObjectMap.containsKey(volume)) {
- // Cannot find a pool for the volume. Throw an exception.
- throw new CloudRuntimeException("Cannot find a storage pool which is available for volume " + volume + " while migrating virtual machine " +
- profile.getVirtualMachine() + " to host " + host);
- }
+ StoragePoolVO volumeStoragePool = _storagePoolDao.findById(volume.getPoolId());
+ if (volumeStoragePool.isLocal()) {
+ diskProfile.setUseLocalStorage(true);
+ }
+ for (StoragePoolAllocator allocator : _storagePoolAllocators) {
+ List<StoragePool> poolListFromAllocator = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL);
+ if (CollectionUtils.isEmpty(poolListFromAllocator)) {
+ continue;
+ }
+ for (StoragePool pool : poolListFromAllocator) {
+ if (pool.isLocal()) {
+ poolList.add(pool);
}
}
}
-
- return volumeToPoolObjectMap;
+ return poolList;
}
private <T extends VMInstanceVO> void moveVmToMigratingState(final T vm, final Long hostId, final ItWorkVO work) throws ConcurrentOperationException {
@@ -2891,8 +2915,11 @@ private String getControlNicIpForVM(VirtualMachine vm) {
if (vm.getType() == VirtualMachine.Type.ConsoleProxy || vm.getType() == VirtualMachine.Type.SecondaryStorageVm) {
NicVO nic = _nicsDao.getControlNicForVM(vm.getId());
return nic.getIPv4Address();
- } else if (vm.getType() == VirtualMachine.Type.DomainRouter) return vm.getPrivateIpAddress();
- else return null;
+ } else if (vm.getType() == VirtualMachine.Type.DomainRouter) {
+ return vm.getPrivateIpAddress();
+ } else {
+ return null;
+ }
}
public Command cleanup(final String vmName) {
VirtualMachine vm = _vmDao.findVMByInstanceName(vmName);
@@ -2961,67 +2988,6 @@ private void updateVmMetaData(Long vmId, String platform) {
_userVmDao.saveDetails(userVm);
}
- private void ensureVmRunningContext(final long hostId, VMInstanceVO vm, final Event cause) throws OperationTimedoutException, ResourceUnavailableException,
- NoTransitionException, InsufficientAddressCapacityException {
- final VirtualMachineGuru vmGuru = getVmGuru(vm);
-
- s_logger.debug("VM state is starting on full sync so updating it to running");
- vm = _vmDao.findById(vm.getId());
-
- // grab outstanding work item if any
- final ItWorkVO work = _workDao.findByOutstandingWork(vm.getId(), vm.getState());
- if (work != null) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Found an outstanding work item for this vm " + vm + " in state:" + vm.getState() + ", work id:" + work.getId());
- }
- }
-
- try {
- stateTransitTo(vm, cause, hostId);
- } catch (final NoTransitionException e1) {
- s_logger.warn(e1.getMessage());
- }
-
- s_logger.debug("VM's " + vm + " state is starting on full sync so updating it to Running");
- vm = _vmDao.findById(vm.getId()); // this should ensure vm has the most
- // up to date info
-
- final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
- final List<NicVO> nics = _nicsDao.listByVmId(profile.getId());
- for (final NicVO nic : nics) {
- final Network network = _networkModel.getNetwork(nic.getNetworkId());
- final NicProfile nicProfile =
- new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network),
- _networkModel.getNetworkTag(profile.getHypervisorType(), network));
- profile.addNic(nicProfile);
- }
-
- final Commands cmds = new Commands(Command.OnError.Stop);
- s_logger.debug("Finalizing commands that need to be send to complete Start process for the vm " + vm);
-
- if (vmGuru.finalizeCommandsOnStart(cmds, profile)) {
- if (cmds.size() != 0) {
- _agentMgr.send(vm.getHostId(), cmds);
- }
-
- if (vmGuru.finalizeStart(profile, vm.getHostId(), cmds, null)) {
- stateTransitTo(vm, cause, vm.getHostId());
- } else {
- s_logger.error("Unable to finish finialization for running vm: " + vm);
- }
- } else {
- s_logger.error("Unable to finalize commands on start for vm: " + vm);
- }
-
- if (work != null) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Updating outstanding work item to Done, id:" + work.getId());
- }
- work.setStep(Step.Done);
- _workDao.update(work.getId(), work);
- }
- }
-
@Override
public boolean isRecurring() {
return true;
@@ -3803,7 +3769,7 @@ private void orchestrateMigrateForScale(final String vmUuid, final long srcHostI
@Override
public boolean replugNic(final Network network, final NicTO nic, final VirtualMachineTO vm, final ReservationContext context, final DeployDestination dest) throws ConcurrentOperationException,
- ResourceUnavailableException, InsufficientCapacityException {
+ ResourceUnavailableException, InsufficientCapacityException {
boolean result = true;
final VMInstanceVO router = _vmDao.findById(vm.getId());
@@ -3825,7 +3791,7 @@ public boolean replugNic(final Network network, final NicTO nic, final VirtualMa
s_logger.warn("Unable to apply ReplugNic, vm " + router + " is not in the right state " + router.getState());
throw new ResourceUnavailableException("Unable to apply ReplugNic on the backend," + " vm " + vm + " is not in the right state", DataCenter.class,
- router.getDataCenterId());
+ router.getDataCenterId());
}
return result;
@@ -4015,8 +3981,8 @@ public String getConfigComponentName() {
@Override
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait,
- VmOpLockStateRetry,
- VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval, VmConfigDriveLabel};
+ VmOpLockStateRetry,
+ VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval, VmConfigDriveLabel};
}
public List<StoragePoolAllocator> getStoragePoolAllocators() {
diff --git a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
index 9bc22c49274..f33cc9699eb 100644
--- a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
@@ -20,455 +20,77 @@
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import java.util.ArrayList;
-import com.cloud.service.dao.ServiceOfferingDao;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Matchers;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
-
-import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
-import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
-import org.apache.cloudstack.framework.config.ConfigDepot;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.mockito.runners.MockitoJUnitRunner;
import com.cloud.agent.AgentManager;
-import com.cloud.agent.api.CheckVirtualMachineAnswer;
-import com.cloud.agent.api.CheckVirtualMachineCommand;
import com.cloud.agent.api.Command;
-import com.cloud.agent.api.MigrateWithStorageAnswer;
-import com.cloud.agent.api.MigrateWithStorageCommand;
-import com.cloud.agent.api.MigrateWithStorageCompleteAnswer;
-import com.cloud.agent.api.MigrateWithStorageCompleteCommand;
-import com.cloud.agent.api.MigrateWithStorageReceiveAnswer;
-import com.cloud.agent.api.MigrateWithStorageReceiveCommand;
-import com.cloud.agent.api.MigrateWithStorageSendAnswer;
-import com.cloud.agent.api.MigrateWithStorageSendCommand;
-import com.cloud.agent.api.PrepareForMigrationAnswer;
-import com.cloud.agent.api.PrepareForMigrationCommand;
-import com.cloud.agent.api.ScaleVmAnswer;
-import com.cloud.agent.api.ScaleVmCommand;
import com.cloud.agent.api.StopAnswer;
import com.cloud.agent.api.StopCommand;
-import com.cloud.capacity.CapacityManager;
-import com.cloud.dc.dao.ClusterDao;
-import com.cloud.dc.dao.DataCenterDao;
-import com.cloud.dc.dao.HostPodDao;
-import com.cloud.deploy.DeployDestination;
import com.cloud.deploy.DeploymentPlanner;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.ManagementServerException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.VirtualMachineMigrationException;
import com.cloud.host.HostVO;
-import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorGuru;
-import com.cloud.hypervisor.HypervisorGuruManager;
-import com.cloud.offering.ServiceOffering;
import com.cloud.service.ServiceOfferingVO;
-import com.cloud.storage.dao.DiskOfferingDao;
-import com.cloud.storage.dao.StoragePoolHostDao;
-import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.dao.VolumeDao;
-import com.cloud.storage.Storage.ProvisioningType;
-import com.cloud.storage.DiskOfferingVO;
-import com.cloud.storage.StoragePoolHostVO;
-import com.cloud.storage.VolumeVO;
-import com.cloud.storage.VMTemplateVO;
-import com.cloud.user.Account;
-import com.cloud.user.AccountVO;
-import com.cloud.user.UserVO;
-import com.cloud.user.dao.AccountDao;
-import com.cloud.user.dao.UserDao;
-import com.cloud.utils.Pair;
-import com.cloud.utils.db.EntityManager;
import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.VirtualMachine.Event;
import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.VirtualMachine.PowerState;
-import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
-import com.cloud.vm.snapshot.VMSnapshotManager;
+@RunWith(MockitoJUnitRunner.class)
public class VirtualMachineManagerImplTest {
@Spy
- VirtualMachineManagerImpl _vmMgr = new VirtualMachineManagerImpl();
- @Mock
- VolumeOrchestrationService _storageMgr;
- @Mock
- Account _account;
- @Mock
- CapacityManager _capacityMgr;
- @Mock
- AgentManager _agentMgr;
- @Mock
- AccountDao _accountDao;
- @Mock
- ConfigurationDao _configDao;
- @Mock
- HostDao _hostDao;
- @Mock
- UserDao _userDao;
- @Mock
- UserVmDao _vmDao;
- @Mock
- ItWorkDao _workDao;
+ @InjectMocks
+ private VirtualMachineManagerImpl virtualMachineManagerImpl;
@Mock
- VMInstanceDao _vmInstanceDao;
+ private AgentManager agentManagerMock;
@Mock
- ServiceOfferingDao _offeringDao;
+ private VMInstanceDao vmInstanceDao;
@Mock
- VMTemplateDao _templateDao;
+ private ServiceOfferingDao serviceOfferingDao;
@Mock
- VolumeDao _volsDao;
+ private VolumeDao volumeDao;
@Mock
- RestoreVMCmd _restoreVMCmd;
+ private VMInstanceVO vmInstanceMock;
@Mock
- AccountVO _accountMock;
+ private ServiceOfferingVO serviceOfferingMock;
@Mock
- UserVO _userMock;
+ private HostVO hostMock;
@Mock
- UserVmVO _vmMock;
- @Mock
- VMInstanceVO _vmInstance;
- @Mock
- ServiceOfferingVO _serviceOfferingMock;
- @Mock
- HostVO _host;
- @Mock
- VMTemplateVO _templateMock;
- @Mock
- VolumeVO _volumeMock;
- @Mock
- List<VolumeVO> _rootVols;
- @Mock
- ItWorkVO _work;
- @Mock
- HostVO hostVO;
- @Mock
- UserVmDetailVO _vmDetailVO;
-
- @Mock
- ClusterDao _clusterDao;
- @Mock
- HostPodDao _podDao;
- @Mock
- DataCenterDao _dcDao;
- @Mock
- DiskOfferingDao _diskOfferingDao;
- @Mock
- PrimaryDataStoreDao _storagePoolDao;
- @Mock
- UserVmDetailsDao _vmDetailsDao;
- @Mock
- StoragePoolHostDao _poolHostDao;
- @Mock
- NetworkOrchestrationService _networkMgr;
- @Mock
- HypervisorGuruManager _hvGuruMgr;
- @Mock
- VMSnapshotManager _vmSnapshotMgr;
-
- // Mock objects for vm migration with storage test.
- @Mock
- DiskOfferingVO _diskOfferingMock;
- @Mock
- StoragePoolVO _srcStoragePoolMock;
- @Mock
- StoragePoolVO _destStoragePoolMock;
- @Mock
- HostVO _srcHostMock;
- @Mock
- HostVO _destHostMock;
- @Mock
- Map<Long, Long> _volumeToPoolMock;
- @Mock
- EntityManager _entityMgr;
- @Mock
- ConfigDepot _configDepot;
+ private VirtualMachineProfile virtualMachineProfileMock;
@Before
public void setup() {
- MockitoAnnotations.initMocks(this);
-
- _vmMgr._templateDao = _templateDao;
- _vmMgr._volsDao = _volsDao;
- _vmMgr.volumeMgr = _storageMgr;
- _vmMgr._capacityMgr = _capacityMgr;
- _vmMgr._hostDao = _hostDao;
- _vmMgr._nodeId = 1L;
- _vmMgr._workDao = _workDao;
- _vmMgr._agentMgr = _agentMgr;
- _vmMgr._podDao = _podDao;
- _vmMgr._clusterDao = _clusterDao;
- _vmMgr._dcDao = _dcDao;
- _vmMgr._diskOfferingDao = _diskOfferingDao;
- _vmMgr._storagePoolDao = _storagePoolDao;
- _vmMgr._poolHostDao = _poolHostDao;
- _vmMgr._networkMgr = _networkMgr;
- _vmMgr._hvGuruMgr = _hvGuruMgr;
- _vmMgr._vmSnapshotMgr = _vmSnapshotMgr;
- _vmMgr._vmDao = _vmInstanceDao;
- _vmMgr._uservmDetailsDao = _vmDetailsDao;
- _vmMgr._entityMgr = _entityMgr;
- _vmMgr._configDepot = _configDepot;
- _vmMgr._offeringDao = _offeringDao;
- _vmMgr.hostAllocators = new ArrayList<>();
-
- when(_vmMock.getId()).thenReturn(314l);
- when(_vmInstance.getId()).thenReturn(1L);
- when(_vmInstance.getServiceOfferingId()).thenReturn(2L);
- when(_vmInstance.getInstanceName()).thenReturn("myVm");
- when(_vmInstance.getHostId()).thenReturn(2L);
- when(_vmInstance.getType()).thenReturn(VirtualMachine.Type.User);
- when(_host.getId()).thenReturn(1L);
- when(_hostDao.findById(anyLong())).thenReturn(null);
- when(_entityMgr.findById(Matchers.eq(ServiceOffering.class), anyLong())).thenReturn(getSvcoffering(512));
- when(_workDao.persist(_work)).thenReturn(_work);
- when(_workDao.update("1", _work)).thenReturn(true);
- when(_work.getId()).thenReturn("1");
- doNothing().when(_work).setStep(ItWorkVO.Step.Done);
- when(_vmInstanceDao.findByUuid(any(String.class))).thenReturn(_vmMock);
- //doNothing().when(_volsDao).detachVolume(anyLong());
- //when(_work.setStep(ItWorkVO.Step.Done)).thenReturn("1");
-
- }
-
- @Test(expected = CloudRuntimeException.class)
- public void testScaleVM1() throws Exception {
-
- DeployDestination dest = new DeployDestination(null, null, null, _host);
- long l = 1L;
-
- when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
- _vmMgr.migrateForScale(_vmInstance.getUuid(), l, dest, l);
-
- }
-
- @Test(expected = CloudRuntimeException.class)
- public void testScaleVM2() throws Exception {
-
- new DeployDestination(null, null, null, _host);
- doReturn(3L).when(_vmInstance).getId();
- when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
- ServiceOfferingVO newServiceOffering = getSvcoffering(512);
- doReturn(1L).when(_vmInstance).getHostId();
- doReturn(hostVO).when(_hostDao).findById(1L);
- doReturn(1L).when(_vmInstance).getDataCenterId();
- doReturn(1L).when(hostVO).getClusterId();
- when(CapacityManager.CpuOverprovisioningFactor.valueIn(1L)).thenReturn(1.0f);
- ScaleVmCommand reconfigureCmd =
- new ScaleVmCommand("myVmName", newServiceOffering.getCpu(), newServiceOffering.getSpeed(), newServiceOffering.getSpeed(), newServiceOffering.getRamSize(),
- newServiceOffering.getRamSize(), newServiceOffering.getLimitCpuUse());
- new ScaleVmAnswer(reconfigureCmd, true, "details");
- when(_agentMgr.send(2l, reconfigureCmd)).thenReturn(null);
- _vmMgr.reConfigureVm(_vmInstance.getUuid(), getSvcoffering(256), false);
-
+ virtualMachineManagerImpl.hostAllocators = new ArrayList<>();
+
+ when(vmInstanceMock.getId()).thenReturn(1L);
+ when(vmInstanceMock.getServiceOfferingId()).thenReturn(2L);
+ when(vmInstanceMock.getInstanceName()).thenReturn("myVm");
+ when(vmInstanceMock.getHostId()).thenReturn(2L);
+ when(vmInstanceMock.getType()).thenReturn(VirtualMachine.Type.User);
+ when(hostMock.getId()).thenReturn(1L);
}
@Test(expected = CloudRuntimeException.class)
public void testScaleVM3() throws Exception {
-
- /*VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
-
- Long srcHostId = vm.getHostId();
- Long oldSvcOfferingId = vm.getServiceOfferingId();
- if (srcHostId == null) {
- throw new CloudRuntimeException("Unable to scale the vm because it doesn't have a host id");
- }*/
-
- when(_vmInstance.getHostId()).thenReturn(null);
- when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
- when(_vmInstanceDao.findByUuid(any(String.class))).thenReturn(_vmInstance);
+ when(vmInstanceMock.getHostId()).thenReturn(null);
+ when(vmInstanceDao.findById(anyLong())).thenReturn(vmInstanceMock);
+ when(vmInstanceDao.findByUuid(any(String.class))).thenReturn(vmInstanceMock);
DeploymentPlanner.ExcludeList excludeHostList = new DeploymentPlanner.ExcludeList();
- _vmMgr.findHostAndMigrate(_vmInstance.getUuid(), 2l, excludeHostList);
-
- }
-
- private ServiceOfferingVO getSvcoffering(int ramSize) {
-
- String name = "name";
- String displayText = "displayText";
- int cpu = 1;
- //int ramSize = 256;
- int speed = 128;
-
- boolean ha = false;
- boolean useLocalStorage = false;
-
- ServiceOfferingVO serviceOffering =
- new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, ProvisioningType.THIN, useLocalStorage, false, null, false, null, false);
- return serviceOffering;
- }
-
- private void initializeMockConfigForMigratingVmWithVolumes() throws OperationTimedoutException, ResourceUnavailableException {
-
- // Mock the source and destination hosts.
- when(_srcHostMock.getId()).thenReturn(5L);
- when(_destHostMock.getId()).thenReturn(6L);
- when(_hostDao.findById(5L)).thenReturn(_srcHostMock);
- when(_hostDao.findById(6L)).thenReturn(_destHostMock);
-
- // Mock the vm being migrated.
- when(_vmMock.getId()).thenReturn(1L);
- when(_vmMock.getHypervisorType()).thenReturn(HypervisorType.XenServer);
- when(_vmMock.getState()).thenReturn(State.Running).thenReturn(State.Running).thenReturn(State.Migrating).thenReturn(State.Migrating);
- when(_vmMock.getHostId()).thenReturn(5L);
- when(_vmInstance.getId()).thenReturn(1L);
- when(_vmInstance.getServiceOfferingId()).thenReturn(2L);
- when(_vmInstance.getInstanceName()).thenReturn("myVm");
- when(_vmInstance.getHostId()).thenReturn(5L);
- when(_vmInstance.getType()).thenReturn(VirtualMachine.Type.User);
- when(_vmInstance.getState()).thenReturn(State.Running).thenReturn(State.Running).thenReturn(State.Migrating).thenReturn(State.Migrating);
-
- // Mock the work item.
- when(_workDao.persist(any(ItWorkVO.class))).thenReturn(_work);
- when(_workDao.update("1", _work)).thenReturn(true);
- when(_work.getId()).thenReturn("1");
- doNothing().when(_work).setStep(ItWorkVO.Step.Done);
-
- // Mock the vm guru and the user vm object that gets returned.
- _vmMgr._vmGurus = new HashMap<VirtualMachine.Type, VirtualMachineGuru>();
-// UserVmManagerImpl userVmManager = mock(UserVmManagerImpl.class);
-// _vmMgr.registerGuru(VirtualMachine.Type.User, userVmManager);
-
- // Mock the iteration over all the volumes of an instance.
- Iterator<VolumeVO> volumeIterator = mock(Iterator.class);
- when(_volsDao.findUsableVolumesForInstance(anyLong())).thenReturn(_rootVols);
- when(_rootVols.iterator()).thenReturn(volumeIterator);
- when(volumeIterator.hasNext()).thenReturn(true, false);
- when(volumeIterator.next()).thenReturn(_volumeMock);
-
- // Mock the disk offering and pool objects for a volume.
- when(_volumeMock.getDiskOfferingId()).thenReturn(5L);
- when(_volumeMock.getPoolId()).thenReturn(200L);
- when(_volumeMock.getId()).thenReturn(5L);
- when(_diskOfferingDao.findById(anyLong())).thenReturn(_diskOfferingMock);
- when(_storagePoolDao.findById(200L)).thenReturn(_srcStoragePoolMock);
- when(_storagePoolDao.findById(201L)).thenReturn(_destStoragePoolMock);
-
- // Mock the volume to pool mapping.
- when(_volumeToPoolMock.get(5L)).thenReturn(201L);
- when(_destStoragePoolMock.getId()).thenReturn(201L);
- when(_srcStoragePoolMock.getId()).thenReturn(200L);
- when(_destStoragePoolMock.isLocal()).thenReturn(false);
- when(_diskOfferingMock.getUseLocalStorage()).thenReturn(false);
- when(_poolHostDao.findByPoolHost(anyLong(), anyLong())).thenReturn(mock(StoragePoolHostVO.class));
-
- // Mock hypervisor guru.
- HypervisorGuru guruMock = mock(HypervisorGuru.class);
- when(_hvGuruMgr.getGuru(HypervisorType.XenServer)).thenReturn(guruMock);
-
- when(_srcHostMock.getClusterId()).thenReturn(3L);
- when(_destHostMock.getClusterId()).thenReturn(3L);
-
- // Mock the commands and answers to the agent.
- PrepareForMigrationAnswer prepAnswerMock = mock(PrepareForMigrationAnswer.class);
- when(prepAnswerMock.getResult()).thenReturn(true);
- when(_agentMgr.send(anyLong(), isA(PrepareForMigrationCommand.class))).thenReturn(prepAnswerMock);
-
- MigrateWithStorageAnswer migAnswerMock = mock(MigrateWithStorageAnswer.class);
- when(migAnswerMock.getResult()).thenReturn(true);
- when(_agentMgr.send(anyLong(), isA(MigrateWithStorageCommand.class))).thenReturn(migAnswerMock);
-
- MigrateWithStorageReceiveAnswer migRecAnswerMock = mock(MigrateWithStorageReceiveAnswer.class);
- when(migRecAnswerMock.getResult()).thenReturn(true);
- when(_agentMgr.send(anyLong(), isA(MigrateWithStorageReceiveCommand.class))).thenReturn(migRecAnswerMock);
-
- MigrateWithStorageSendAnswer migSendAnswerMock = mock(MigrateWithStorageSendAnswer.class);
- when(migSendAnswerMock.getResult()).thenReturn(true);
- when(_agentMgr.send(anyLong(), isA(MigrateWithStorageSendCommand.class))).thenReturn(migSendAnswerMock);
-
- MigrateWithStorageCompleteAnswer migCompleteAnswerMock = mock(MigrateWithStorageCompleteAnswer.class);
- when(migCompleteAnswerMock.getResult()).thenReturn(true);
- when(_agentMgr.send(anyLong(), isA(MigrateWithStorageCompleteCommand.class))).thenReturn(migCompleteAnswerMock);
-
- CheckVirtualMachineAnswer checkVmAnswerMock = mock(CheckVirtualMachineAnswer.class);
- when(checkVmAnswerMock.getResult()).thenReturn(true);
- when(checkVmAnswerMock.getState()).thenReturn(PowerState.PowerOn);
- when(_agentMgr.send(anyLong(), isA(CheckVirtualMachineCommand.class))).thenReturn(checkVmAnswerMock);
-
- // Mock the state transitions of vm.
- Pair<Long, Long> opaqueMock = new Pair<Long, Long>(_vmMock.getHostId(), _destHostMock.getId());
- when(_vmSnapshotMgr.hasActiveVMSnapshotTasks(anyLong())).thenReturn(false);
- when(_vmInstanceDao.updateState(State.Running, Event.MigrationRequested, State.Migrating, _vmMock, opaqueMock)).thenReturn(true);
- when(_vmInstanceDao.updateState(State.Migrating, Event.OperationSucceeded, State.Running, _vmMock, opaqueMock)).thenReturn(true);
- }
-
- // Check migration of a vm with its volumes within a cluster.
- @Test
- public void testMigrateWithVolumeWithinCluster() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
- VirtualMachineMigrationException, OperationTimedoutException {
-
- initializeMockConfigForMigratingVmWithVolumes();
- when(_srcHostMock.getClusterId()).thenReturn(3L);
- when(_destHostMock.getClusterId()).thenReturn(3L);
-
- _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock);
- }
-
- // Check migration of a vm with its volumes across a cluster.
- @Test
- public void testMigrateWithVolumeAcrossCluster() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
- VirtualMachineMigrationException, OperationTimedoutException {
-
- initializeMockConfigForMigratingVmWithVolumes();
- when(_srcHostMock.getClusterId()).thenReturn(3L);
- when(_destHostMock.getClusterId()).thenReturn(4L);
-
- _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock);
- }
-
- // Check migration of a vm fails when src and destination pool are not of same type; that is, one is shared and
- // other is local.
- @Test(expected = CloudRuntimeException.class)
- public void testMigrateWithVolumeFail1() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
- VirtualMachineMigrationException, OperationTimedoutException {
-
- initializeMockConfigForMigratingVmWithVolumes();
- when(_srcHostMock.getClusterId()).thenReturn(3L);
- when(_destHostMock.getClusterId()).thenReturn(3L);
-
- when(_destStoragePoolMock.isLocal()).thenReturn(true);
- when(_diskOfferingMock.getUseLocalStorage()).thenReturn(false);
-
- _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock);
- }
-
- // Check migration of a vm fails when vm is not in Running state.
- @Test(expected = ConcurrentOperationException.class)
- public void testMigrateWithVolumeFail2() throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
- VirtualMachineMigrationException, OperationTimedoutException {
-
- initializeMockConfigForMigratingVmWithVolumes();
- when(_srcHostMock.getClusterId()).thenReturn(3L);
- when(_destHostMock.getClusterId()).thenReturn(3L);
-
- when(_vmMock.getState()).thenReturn(State.Stopped);
-
- _vmMgr.migrateWithStorage(_vmInstance.getUuid(), _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock);
+ virtualMachineManagerImpl.findHostAndMigrate(vmInstanceMock.getUuid(), 2l, excludeHostList);
}
@Test
@@ -479,9 +101,9 @@ public void testSendStopWithOkAnswer() throws Exception {
StopAnswer answer = new StopAnswer(new StopCommand(vm, false, false), "ok", true);
when(profile.getVirtualMachine()).thenReturn(vm);
when(vm.getHostId()).thenReturn(1L);
- when(_agentMgr.send(anyLong(), (Command)any())).thenReturn(answer);
+ when(agentManagerMock.send(anyLong(), (Command)any())).thenReturn(answer);
- boolean actual = _vmMgr.sendStop(guru, profile, false, false);
+ boolean actual = virtualMachineManagerImpl.sendStop(guru, profile, false, false);
Assert.assertTrue(actual);
}
@@ -494,9 +116,9 @@ public void testSendStopWithFailAnswer() throws Exception {
StopAnswer answer = new StopAnswer(new StopCommand(vm, false, false), "fail", false);
when(profile.getVirtualMachine()).thenReturn(vm);
when(vm.getHostId()).thenReturn(1L);
- when(_agentMgr.send(anyLong(), (Command)any())).thenReturn(answer);
+ when(agentManagerMock.send(anyLong(), (Command)any())).thenReturn(answer);
- boolean actual = _vmMgr.sendStop(guru, profile, false, false);
+ boolean actual = virtualMachineManagerImpl.sendStop(guru, profile, false, false);
Assert.assertFalse(actual);
}
@@ -508,38 +130,38 @@ public void testSendStopWithNullAnswer() throws Exception {
VirtualMachineProfile profile = mock(VirtualMachineProfile.class);
when(profile.getVirtualMachine()).thenReturn(vm);
when(vm.getHostId()).thenReturn(1L);
- when(_agentMgr.send(anyLong(), (Command)any())).thenReturn(null);
+ when(agentManagerMock.send(anyLong(), (Command)any())).thenReturn(null);
- boolean actual = _vmMgr.sendStop(guru, profile, false, false);
+ boolean actual = virtualMachineManagerImpl.sendStop(guru, profile, false, false);
Assert.assertFalse(actual);
}
@Test
public void testExeceuteInSequence() {
- assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.XenServer) == false);
- assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.KVM) == false);
- assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.VMware) == HypervisorGuru.VmwareFullClone.value());
- assertTrue(_vmMgr.getExecuteInSequence(HypervisorType.Ovm3) == VirtualMachineManager.ExecuteInSequence.value());
+ assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.XenServer) == false);
+ assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.KVM) == false);
+ assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.VMware) == HypervisorGuru.VmwareFullClone.value());
+ assertTrue(virtualMachineManagerImpl.getExecuteInSequence(HypervisorType.Ovm3) == VirtualMachineManager.ExecuteInSequence.value());
}
@Test
public void testCheckIfCanUpgrade() throws Exception {
- when(_vmInstance.getState()).thenReturn(State.Stopped);
- when(_serviceOfferingMock.isDynamic()).thenReturn(true);
- when(_vmInstance.getServiceOfferingId()).thenReturn(1l);
- when(_serviceOfferingMock.getId()).thenReturn(2l);
+ when(vmInstanceMock.getState()).thenReturn(State.Stopped);
+ when(serviceOfferingMock.isDynamic()).thenReturn(true);
+ when(vmInstanceMock.getServiceOfferingId()).thenReturn(1l);
+ when(serviceOfferingMock.getId()).thenReturn(2l);
ServiceOfferingVO mockCurrentServiceOffering = mock(ServiceOfferingVO.class);
- when(_offeringDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(mockCurrentServiceOffering);
+ when(serviceOfferingDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(mockCurrentServiceOffering);
when(mockCurrentServiceOffering.getUseLocalStorage()).thenReturn(true);
- when(_serviceOfferingMock.getUseLocalStorage()).thenReturn(true);
+ when(serviceOfferingMock.getUseLocalStorage()).thenReturn(true);
when(mockCurrentServiceOffering.getSystemUse()).thenReturn(true);
- when(_serviceOfferingMock.getSystemUse()).thenReturn(true);
+ when(serviceOfferingMock.getSystemUse()).thenReturn(true);
when(mockCurrentServiceOffering.getTags()).thenReturn("x,y");
- when(_serviceOfferingMock.getTags()).thenReturn("z,x,y");
+ when(serviceOfferingMock.getTags()).thenReturn("z,x,y");
- _vmMgr.checkIfCanUpgrade(_vmInstance, _serviceOfferingMock);
+ virtualMachineManagerImpl.checkIfCanUpgrade(vmInstanceMock, serviceOfferingMock);
}
}
diff --git a/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
index b4d2f6f785f..a4341380ddc 100644
--- a/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
@@ -18,7 +18,7 @@
import java.util.List;
-
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -66,6 +66,9 @@ HypervisorCapabilitiesVO getCapabilities(HypervisorType hypervisorType, String h
@Override
public HypervisorCapabilitiesVO findByHypervisorTypeAndVersion(HypervisorType hypervisorType, String hypervisorVersion) {
+ if (StringUtils.isBlank(hypervisorVersion)) {
+ hypervisorVersion = DEFAULT_VERSION;
+ }
SearchCriteria<HypervisorCapabilitiesVO> sc = HypervisorTypeAndVersionSearch.create();
sc.setParameters("hypervisorType", hypervisorType);
sc.setParameters("hypervisorVersion", hypervisorVersion);
@@ -76,11 +79,13 @@ public HypervisorCapabilitiesVO findByHypervisorTypeAndVersion(HypervisorType hy
public Long getMaxGuestsLimit(HypervisorType hypervisorType, String hypervisorVersion) {
Long defaultLimit = new Long(50);
HypervisorCapabilitiesVO result = getCapabilities(hypervisorType, hypervisorVersion);
- if (result == null)
+ if (result == null) {
return defaultLimit;
+ }
Long limit = result.getMaxGuestsLimit();
- if (limit == null)
+ if (limit == null) {
return defaultLimit;
+ }
return limit;
}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
index 6fd4808f7d4..d4ca9f6d215 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
@@ -231,23 +231,21 @@ public StoragePoolVO findPoolByHostPath(long datacenterId, Long podId, String ho
@Override
public List<StoragePoolVO> listBy(long datacenterId, Long podId, Long clusterId, ScopeType scope) {
+ SearchCriteria<StoragePoolVO> sc = null;
if (clusterId != null) {
- SearchCriteria<StoragePoolVO> sc = DcPodSearch.create();
- sc.setParameters("datacenterId", datacenterId);
- sc.setParameters("podId", podId);
- sc.setParameters("status", Status.Up);
- sc.setParameters("scope", scope);
-
+ sc = DcPodSearch.create();
sc.setParameters("cluster", clusterId);
- return listBy(sc);
} else {
- SearchCriteria<StoragePoolVO> sc = DcPodAnyClusterSearch.create();
- sc.setParameters("datacenterId", datacenterId);
- sc.setParameters("podId", podId);
- sc.setParameters("status", Status.Up);
+ sc = DcPodAnyClusterSearch.create();
+
+ }
+ sc.setParameters("datacenterId", datacenterId);
+ sc.setParameters("podId", podId);
+ sc.setParameters("status", Status.Up);
+ if (scope != null) {
sc.setParameters("scope", scope);
- return listBy(sc);
}
+ return listBy(sc);
}
@Override
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
index b040c74c28c..6e9c682e970 100644
--- a/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
+++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
@@ -48,11 +48,6 @@
protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) {
s_logger.debug("ClusterScopeStoragePoolAllocator looking for storage pool");
- if (dskCh.useLocalStorage()) {
- // cluster wide allocator should bail out in case of local disk
- return null;
- }
-
List<StoragePool> suitablePools = new ArrayList<StoragePool>();
long dcId = plan.getDataCenterId();
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 56c912d29c1..56a6b77b407 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -140,15 +140,15 @@
import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd;
import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd;
+import org.apache.cloudstack.api.command.admin.outofbandmanagement.ChangeOutOfBandManagementPasswordCmd;
+import org.apache.cloudstack.api.command.admin.outofbandmanagement.ConfigureOutOfBandManagementCmd;
import org.apache.cloudstack.api.command.admin.outofbandmanagement.DisableOutOfBandManagementForClusterCmd;
import org.apache.cloudstack.api.command.admin.outofbandmanagement.DisableOutOfBandManagementForHostCmd;
import org.apache.cloudstack.api.command.admin.outofbandmanagement.DisableOutOfBandManagementForZoneCmd;
import org.apache.cloudstack.api.command.admin.outofbandmanagement.EnableOutOfBandManagementForClusterCmd;
import org.apache.cloudstack.api.command.admin.outofbandmanagement.EnableOutOfBandManagementForHostCmd;
import org.apache.cloudstack.api.command.admin.outofbandmanagement.EnableOutOfBandManagementForZoneCmd;
-import org.apache.cloudstack.api.command.admin.outofbandmanagement.ConfigureOutOfBandManagementCmd;
import org.apache.cloudstack.api.command.admin.outofbandmanagement.IssueOutOfBandManagementPowerActionCmd;
-import org.apache.cloudstack.api.command.admin.outofbandmanagement.ChangeOutOfBandManagementPasswordCmd;
import org.apache.cloudstack.api.command.admin.pod.CreatePodCmd;
import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;
import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;
@@ -519,7 +519,6 @@
import org.apache.cloudstack.config.Configuration;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
import org.apache.cloudstack.framework.config.ConfigDepot;
import org.apache.cloudstack.framework.config.ConfigKey;
@@ -535,6 +534,8 @@
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
@@ -696,7 +697,7 @@
public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName());
static final ConfigKey<Integer> vmPasswordLength = new ConfigKey<Integer>("Advanced", Integer.class, "vm.password.length", "6",
- "Specifies the length of a randomly generated password", false);
+ "Specifies the length of a randomly generated password", false);
static final ConfigKey<Integer> sshKeyLength = new ConfigKey<Integer>("Advanced", Integer.class, "ssh.key.length",
"2048", "Specifies custom SSH key length (bit)", true, ConfigKey.Scope.Global);
@Inject
@@ -794,8 +795,6 @@
@Inject
private HighAvailabilityManager _haMgr;
@Inject
- private DataStoreManager dataStoreMgr;
- @Inject
private HostTagsDao _hostTagsDao;
@Inject
private ConfigDepot _configDepot;
@@ -809,12 +808,12 @@
private DeploymentPlanningManager _dpMgr;
@Inject
private GuestOsDetailsDao _guestOsDetailsDao;
+ @Inject
+ private KeystoreManager _ksMgr;
private LockMasterListener _lockMasterListener;
private final ScheduledExecutorService _eventExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker"));
private final ScheduledExecutorService _alertExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("AlertChecker"));
- @Inject
- private KeystoreManager _ksMgr;
private Map<String, String> _configs;
@@ -1127,9 +1126,9 @@ public boolean deleteEvents(final DeleteEventsCmd cmd) {
@Override
public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>>
- listHostsForMigrationOfVM(final Long vmId,
- final Long startIndex,
- final Long pageSize, final String keyword) {
+ listHostsForMigrationOfVM(final Long vmId,
+ final Long startIndex,
+ final Long pageSize, final String keyword) {
final Account caller = getCaller();
if (!_accountMgr.isRootAdmin(caller.getId())) {
if (s_logger.isDebugEnabled()) {
@@ -1224,14 +1223,14 @@ public boolean deleteEvents(final DeleteEventsCmd cmd) {
allHosts.remove(srcHost);
for (final VolumeVO volume : volumes) {
- final StoragePool storagePool = _poolDao.findById(volume.getPoolId());
- final Long volClusterId = storagePool.getClusterId();
+ StoragePool storagePool = _poolDao.findById(volume.getPoolId());
+ Long volClusterId = storagePool.getClusterId();
- for (final Iterator<HostVO> iterator = allHosts.iterator(); iterator.hasNext();) {
+ for (Iterator<HostVO> iterator = allHosts.iterator(); iterator.hasNext();) {
final Host host = iterator.next();
if (volClusterId != null) {
- if (!host.getClusterId().equals(volClusterId) || usesLocal) {
+ if (storagePool.isLocal() || !host.getClusterId().equals(volClusterId) || usesLocal) {
if (storagePool.isManaged()) {
// At the time being, we do not support storage migration of a volume from managed storage unless the managed storage
// is at the zone level and the source and target storage pool is the same.
@@ -1346,8 +1345,8 @@ private boolean hasSuitablePoolsForVolume(final VolumeVO volume, final Host host
}
// Volume must be attached to an instance for live migration.
- final List<StoragePool> allPools = new ArrayList<StoragePool>();
- final List<StoragePool> suitablePools = new ArrayList<StoragePool>();
+ List<? extends StoragePool> allPools = new ArrayList<StoragePool>();
+ List<? extends StoragePool> suitablePools = new ArrayList<StoragePool>();
// Volume must be in Ready state to be migrated.
if (!Volume.State.Ready.equals(volume.getState())) {
@@ -1355,11 +1354,6 @@ private boolean hasSuitablePoolsForVolume(final VolumeVO volume, final Host host
return new Pair<List<? extends StoragePool>, List<? extends StoragePool>>(allPools, suitablePools);
}
- if (!_volumeMgr.volumeOnSharedStoragePool(volume)) {
- s_logger.info("Volume " + volume + " is on local storage. It cannot be migrated to another pool.");
- return new Pair<List<? extends StoragePool>, List<? extends StoragePool>>(allPools, suitablePools);
- }
-
final Long instanceId = volume.getInstanceId();
VMInstanceVO vm = null;
if (instanceId != null) {
@@ -1397,55 +1391,78 @@ private boolean hasSuitablePoolsForVolume(final VolumeVO volume, final Host host
}
}
- // Source pool of the volume.
- final StoragePoolVO srcVolumePool = _poolDao.findById(volume.getPoolId());
- // Get all the pools available. Only shared pools are considered because only a volume on a shared pools
- // can be live migrated while the virtual machine stays on the same host.
+ StoragePool srcVolumePool = _poolDao.findById(volume.getPoolId());
+ allPools = getAllStoragePoolCompatileWithVolumeSourceStoragePool(srcVolumePool);
+ allPools.remove(srcVolumePool);
+ suitablePools = findAllSuitableStoragePoolsForVm(volume, vm, srcVolumePool);
- List<StoragePoolVO> storagePools;
+ return new Pair<List<? extends StoragePool>, List<? extends StoragePool>>(allPools, suitablePools);
+ }
- if (srcVolumePool.getClusterId() != null) {
- storagePools = _poolDao.findPoolsByTags(volume.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null);
+
+ /**
+ * This method looks for all storage pools that are compatible with the given volume.
+ * <ul>
+ * <li>We will look for storage systems that are zone wide.</li>
+ * <li>We also all storage available filtering by data center, pod and cluster as the current storage pool used by the given volume.</li>
+ * </ul>
+ */
+ private List<? extends StoragePool> getAllStoragePoolCompatileWithVolumeSourceStoragePool(StoragePool srcVolumePool) {
+ List<StoragePoolVO> storagePools = new ArrayList<>();
+ List<StoragePoolVO> zoneWideStoragePools = _poolDao.findZoneWideStoragePoolsByTags(srcVolumePool.getDataCenterId(), null);
+ if(CollectionUtils.isNotEmpty(zoneWideStoragePools)) {
+ storagePools.addAll(zoneWideStoragePools);
}
- else {
- storagePools = new ArrayList<>();
+ List<StoragePoolVO> clusterAndLocalStoragePools = _poolDao.listBy(srcVolumePool.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null);
+ if(CollectionUtils.isNotEmpty(clusterAndLocalStoragePools)) {
+ storagePools.addAll(clusterAndLocalStoragePools);
}
+ return storagePools;
+ }
- List<StoragePoolVO> zoneWideStoragePools = _poolDao.findZoneWideStoragePoolsByTags(volume.getDataCenterId(), null);
-
- storagePools.addAll(zoneWideStoragePools);
+ /**
+ * Looks for all suitable storage pools to allocate the given volume.
+ * We take into account the service offering of the VM and volume to find suitable storage pools. It is also excluded from the search the current storage pool used by the volume.
+ * We use {@link StoragePoolAllocator} to look for possible storage pools to allocate the given volume. We will look for possible local storage poosl even if the volume is using a shared storage disk offering.
+ *
+ * Side note: the idea behind this method is to provide power for administrators of manually overriding deployments defined by CloudStack.
+ */
+ private List<StoragePool> findAllSuitableStoragePoolsForVm(final VolumeVO volume, VMInstanceVO vm, StoragePool srcVolumePool) {
+ List<StoragePool> suitablePools = new ArrayList<>();
- storagePools.remove(srcVolumePool);
- for (final StoragePoolVO pool : storagePools) {
- if (pool.isShared()) {
- allPools.add((StoragePool)dataStoreMgr.getPrimaryDataStore(pool.getId()));
- }
+ HostVO host = _hostDao.findById(vm.getHostId());
+ if (host == null) {
+ host = _hostDao.findById(vm.getLastHostId());
}
- // Get all the suitable pools.
- // Exclude the current pool from the list of pools to which the volume can be migrated.
- final ExcludeList avoid = new ExcludeList();
+ ExcludeList avoid = new ExcludeList();
avoid.addPool(srcVolumePool.getId());
- // Volume stays in the same cluster after migration.
- final DataCenterDeployment plan = new DataCenterDeployment(volume.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null, null, null);
- final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+ DataCenterDeployment plan = new DataCenterDeployment(volume.getDataCenterId(), srcVolumePool.getPodId(), srcVolumePool.getClusterId(), null, null, null);
+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
- final DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId());
- final DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType());
+ DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId());
+ //This is an override mechanism so we can list the possible local storage pools that a volume in a shared pool might be able to be migrated to
+ DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType());
+ diskProfile.setUseLocalStorage(true);
- // Call the storage pool allocator to find the list of storage pools.
- for (final StoragePoolAllocator allocator : _storagePoolAllocators) {
- final List<StoragePool> pools = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL);
- if (pools != null && !pools.isEmpty()) {
- suitablePools.addAll(pools);
- break;
+ for (StoragePoolAllocator allocator : _storagePoolAllocators) {
+ List<StoragePool> pools = allocator.allocateToPool(diskProfile, profile, plan, avoid, StoragePoolAllocator.RETURN_UPTO_ALL);
+ if (CollectionUtils.isEmpty(pools)) {
+ continue;
}
- }
+ for (StoragePool pool : pools) {
+ boolean isLocalPoolSameHostAsSourcePool = pool.isLocal() && StringUtils.equals(host.getPrivateIpAddress(), pool.getHostAddress());
+ if (isLocalPoolSameHostAsSourcePool || pool.isShared()) {
+ suitablePools.add(pool);
+ }
- return new Pair<List<? extends StoragePool>, List<? extends StoragePool>>(allPools, suitablePools);
+ }
+ }
+ return suitablePools;
}
+
private Pair<List<HostVO>, Integer> searchForServers(final Long startIndex, final Long pageSize, final Object name, final Object type, final Object state, final Object zone, final Object pod, final Object cluster,
final Object id, final Object keyword, final Object resourceState, final Object haHosts, final Object hypervisorType, final Object hypervisorVersion) {
final Filter searchFilter = new Filter(HostVO.class, "id", Boolean.TRUE, startIndex, pageSize);
@@ -1888,10 +1905,8 @@ private boolean hasSuitablePoolsForVolume(final VolumeVO volume, final Host host
vlanSearch.and("vlanType", vlanSearch.entity().getVlanType(), SearchCriteria.Op.EQ);
sb.join("vlanSearch", vlanSearch, sb.entity().getVlanId(), vlanSearch.entity().getId(), JoinBuilder.JoinType.INNER);
- boolean allocatedOnly = false;
if (isAllocated != null && isAllocated == true) {
sb.and("allocated", sb.entity().getAllocatedTime(), SearchCriteria.Op.NNULL);
- allocatedOnly = true;
}
VlanType vlanType = null;
@@ -2149,7 +2164,7 @@ public GuestOS addGuestOs(final AddGuestOsCmd cmd) {
if(cmd.getDetails() != null && !cmd.getDetails().isEmpty()){
Map<String, String> detailsMap = cmd.getDetails();
for(Object key: detailsMap.keySet()){
- _guestOsDetailsDao.addDetail(guestOsPersisted.getId(),(String) key,detailsMap.get((String) key), false);
+ _guestOsDetailsDao.addDetail(guestOsPersisted.getId(),(String) key,detailsMap.get(key), false);
}
}
@@ -2182,7 +2197,7 @@ public GuestOS updateGuestOs(final UpdateGuestOsCmd cmd) {
if(cmd.getDetails() != null && !cmd.getDetails().isEmpty()){
Map<String, String> detailsMap = cmd.getDetails();
for(Object key: detailsMap.keySet()){
- _guestOsDetailsDao.addDetail(id,(String) key,detailsMap.get((String) key), false);
+ _guestOsDetailsDao.addDetail(id,(String) key,detailsMap.get(key), false);
}
}
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index bea9b4ad5bf..81d5221b6e4 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -16,6 +16,70 @@
// under the License.
package com.cloud.storage;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
+import org.apache.cloudstack.api.response.GetUploadParamsResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
+import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
+import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
+import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult;
+import org.apache.cloudstack.framework.async.AsyncCallFuture;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.jobs.AsyncJob;
+import org.apache.cloudstack.framework.jobs.AsyncJobExecutionContext;
+import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.framework.jobs.Outcome;
+import org.apache.cloudstack.framework.jobs.dao.VmWorkJobDao;
+import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.framework.jobs.impl.OutcomeImpl;
+import org.apache.cloudstack.framework.jobs.impl.VmWorkJobVO;
+import org.apache.cloudstack.jobs.JobInfo;
+import org.apache.cloudstack.storage.command.AttachAnswer;
+import org.apache.cloudstack.storage.command.AttachCommand;
+import org.apache.cloudstack.storage.command.DettachCommand;
+import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
+import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
+import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
+import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
+import org.apache.log4j.Logger;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.ModifyTargetsCommand;
@@ -26,7 +90,6 @@
import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.dc.ClusterDetailsDao;
-import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
@@ -53,7 +116,6 @@
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
-import com.cloud.storage.dao.VolumeDetailsDao;
import com.cloud.storage.snapshot.SnapshotApiService;
import com.cloud.storage.snapshot.SnapshotManager;
import com.cloud.template.TemplateManager;
@@ -111,150 +173,82 @@
import com.google.gson.GsonBuilder;
import com.google.gson.JsonParseException;
-import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
-import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
-import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
-import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
-import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd;
-import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
-import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
-import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
-import org.apache.cloudstack.api.response.GetUploadParamsResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
-import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
-import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
-import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
-import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult;
-import org.apache.cloudstack.framework.async.AsyncCallFuture;
-import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.framework.jobs.AsyncJob;
-import org.apache.cloudstack.framework.jobs.AsyncJobExecutionContext;
-import org.apache.cloudstack.framework.jobs.AsyncJobManager;
-import org.apache.cloudstack.framework.jobs.Outcome;
-import org.apache.cloudstack.framework.jobs.dao.VmWorkJobDao;
-import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
-import org.apache.cloudstack.framework.jobs.impl.OutcomeImpl;
-import org.apache.cloudstack.framework.jobs.impl.VmWorkJobVO;
-import org.apache.cloudstack.jobs.JobInfo;
-import org.apache.cloudstack.storage.command.AttachAnswer;
-import org.apache.cloudstack.storage.command.AttachCommand;
-import org.apache.cloudstack.storage.command.DettachCommand;
-import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
-import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
-import org.apache.cloudstack.utils.identity.ManagementServerNode;
-import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
-import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
-import org.apache.log4j.Logger;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
-import javax.inject.Inject;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-
public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiService, VmWorkJobHandler {
private final static Logger s_logger = Logger.getLogger(VolumeApiServiceImpl.class);
public static final String VM_WORK_JOB_HANDLER = VolumeApiServiceImpl.class.getSimpleName();
@Inject
- VolumeOrchestrationService _volumeMgr;
- @Inject
- EntityManager _entityMgr;
+ private UserVmManager _userVmMgr;
@Inject
- AgentManager _agentMgr;
+ private VolumeOrchestrationService _volumeMgr;
@Inject
- TemplateManager _tmpltMgr;
+ private EntityManager _entityMgr;
@Inject
- SnapshotManager _snapshotMgr;
+ private AgentManager _agentMgr;
@Inject
- AccountManager _accountMgr;
+ private TemplateManager _tmpltMgr;
@Inject
- ConfigurationManager _configMgr;
+ private SnapshotManager _snapshotMgr;
@Inject
- VolumeDao _volsDao;
+ private AccountManager _accountMgr;
@Inject
- VolumeDetailsDao _volDetailDao;
+ private ConfigurationManager _configMgr;
@Inject
- HostDao _hostDao;
+ private VolumeDao _volsDao;
@Inject
- SnapshotDao _snapshotDao;
+ private HostDao _hostDao;
@Inject
- ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
+ private SnapshotDao _snapshotDao;
@Inject
- StoragePoolDetailsDao storagePoolDetailsDao;
+ private ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
@Inject
- UserVmDao _userVmDao;
+ private UserVmDao _userVmDao;
@Inject
- UserVmService _userVmService;
+ private UserVmService _userVmService;
@Inject
- VolumeDataStoreDao _volumeStoreDao;
+ private VolumeDataStoreDao _volumeStoreDao;
@Inject
- VMInstanceDao _vmInstanceDao;
+ private VMInstanceDao _vmInstanceDao;
@Inject
- PrimaryDataStoreDao _storagePoolDao;
+ private PrimaryDataStoreDao _storagePoolDao;
@Inject
- DiskOfferingDao _diskOfferingDao;
+ private DiskOfferingDao _diskOfferingDao;
@Inject
- AccountDao _accountDao;
+ private AccountDao _accountDao;
@Inject
- DataCenterDao _dcDao = null;
+ private DataCenterDao _dcDao;
@Inject
- VMTemplateDao _templateDao;
+ private VMTemplateDao _templateDao;
@Inject
- ResourceLimitService _resourceLimitMgr;
+ private ResourceLimitService _resourceLimitMgr;
@Inject
- VmDiskStatisticsDao _vmDiskStatsDao;
+ private VmDiskStatisticsDao _vmDiskStatsDao;
@Inject
- VMSnapshotDao _vmSnapshotDao;
+ private VMSnapshotDao _vmSnapshotDao;
@Inject
- ConfigurationDao _configDao;
+ private ConfigurationDao _configDao;
@Inject
- DataStoreManager dataStoreMgr;
+ private DataStoreManager dataStoreMgr;
@Inject
- VolumeService volService;
+ private VolumeService volService;
@Inject
- VolumeDataFactory volFactory;
+ private VolumeDataFactory volFactory;
@Inject
- SnapshotApiService snapshotMgr;
+ private SnapshotApiService snapshotMgr;
@Inject
- UUIDManager _uuidMgr;
+ private UUIDManager _uuidMgr;
@Inject
- HypervisorCapabilitiesDao _hypervisorCapabilitiesDao;
+ private HypervisorCapabilitiesDao _hypervisorCapabilitiesDao;
@Inject
- AsyncJobManager _jobMgr;
+ private AsyncJobManager _jobMgr;
@Inject
- VmWorkJobDao _workJobDao;
+ private VmWorkJobDao _workJobDao;
@Inject
- ClusterDetailsDao _clusterDetailsDao;
+ private ClusterDetailsDao _clusterDetailsDao;
@Inject
- UserVmManager _userVmMgr;
+ private StorageManager storageMgr;
+
protected Gson _gson;
- @Inject
- StorageManager storageMgr;
private List<StoragePoolAllocator> _storagePoolAllocators;
@@ -358,13 +352,13 @@ public GetUploadParamsResponse doInTransaction(TransactionStatus status) throws
response.setTimeout(expires);
String key = _configDao.getValue(Config.SSVMPSK.key());
- /*
- * encoded metadata using the post upload config key
- */
+ /*
+ * encoded metadata using the post upload config key
+ */
TemplateOrVolumePostUploadCommand command =
- new TemplateOrVolumePostUploadCommand(vol.getId(), vol.getUuid(), volumeStore.getInstallPath(), cmd.getChecksum(), vol.getType().toString(),
- vol.getName(), vol.getFormat().toString(), dataObject.getDataStore().getUri(),
- dataObject.getDataStore().getRole().toString());
+ new TemplateOrVolumePostUploadCommand(vol.getId(), vol.getUuid(), volumeStore.getInstallPath(), cmd.getChecksum(), vol.getType().toString(),
+ vol.getName(), vol.getFormat().toString(), dataObject.getDataStore().getUri(),
+ dataObject.getDataStore().getRole().toString());
command.setLocalPath(volumeStore.getLocalDownloadPath());
//using the existing max upload size configuration
command.setMaxUploadSize(_configDao.getValue(Config.MaxUploadVolumeSize.key()));
@@ -1148,7 +1142,7 @@ private void validateIops(Long minIops, Long maxIops) {
}
private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long newSize, Long newMinIops, Long newMaxIops,
- Integer newHypervisorSnapshotReserve, Long newDiskOfferingId, boolean shrinkOk) {
+ Integer newHypervisorSnapshotReserve, Long newDiskOfferingId, boolean shrinkOk) {
VolumeVO volume = _volsDao.findById(volumeId);
UserVmVO userVm = _userVmDao.findById(volume.getInstanceId());
StoragePoolVO storagePool = _storagePoolDao.findById(volume.getPoolId());
@@ -1410,7 +1404,7 @@ private Volume orchestrateAttachVolumeToVM(Long vmId, Long volumeId, Long device
PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)newVolumeOnPrimaryStorage.getDataStore();
if (primaryStore.isLocal()) {
throw new CloudRuntimeException("Failed to attach local data volume " + volumeToAttach.getName() + " to VM " + vm.getDisplayName()
- + " as migration of local data volume is not allowed");
+ + " as migration of local data volume is not allowed");
}
StoragePoolVO vmRootVolumePool = _storagePoolDao.findById(exstingVolumeOfVm.getPoolId());
@@ -1585,15 +1579,15 @@ public Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId) {
Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob());
if (jobResult != null) {
- if (jobResult instanceof ConcurrentOperationException)
+ if (jobResult instanceof ConcurrentOperationException) {
throw (ConcurrentOperationException)jobResult;
- else if (jobResult instanceof InvalidParameterValueException)
+ } else if (jobResult instanceof InvalidParameterValueException) {
throw (InvalidParameterValueException)jobResult;
- else if (jobResult instanceof RuntimeException)
+ } else if (jobResult instanceof RuntimeException) {
throw (RuntimeException)jobResult;
- else if (jobResult instanceof Throwable)
+ } else if (jobResult instanceof Throwable) {
throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
- else if (jobResult instanceof Long) {
+ } else if (jobResult instanceof Long) {
vol = _volsDao.findById((Long)jobResult);
}
}
@@ -1607,8 +1601,9 @@ public Volume updateVolume(long volumeId, String path, String state, Long storag
VolumeVO volume = _volsDao.findById(volumeId);
- if(volume == null)
+ if(volume == null) {
throw new InvalidParameterValueException("The volume id doesn't exist");
+ }
if (path != null) {
volume.setPath(path);
@@ -1689,8 +1684,9 @@ private void saveUsageEvent(Volume volume, Boolean displayVolume){
}
private boolean isVolumeDestroyed(Volume volume){
- if(volume.getState() == Volume.State.Destroy || volume.getState() == Volume.State.Expunging && volume.getState() == Volume.State.Expunged)
+ if(volume.getState() == Volume.State.Destroy || volume.getState() == Volume.State.Expunging && volume.getState() == Volume.State.Expunged) {
return true;
+ }
return false;
}
@@ -1791,13 +1787,13 @@ public Volume detachVolumeFromVM(DetachVolumeCmd cmmd) {
Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob());
if (jobResult != null) {
- if (jobResult instanceof ConcurrentOperationException)
+ if (jobResult instanceof ConcurrentOperationException) {
throw (ConcurrentOperationException)jobResult;
- else if (jobResult instanceof RuntimeException)
+ } else if (jobResult instanceof RuntimeException) {
throw (RuntimeException)jobResult;
- else if (jobResult instanceof Throwable)
+ } else if (jobResult instanceof Throwable) {
throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
- else if (jobResult instanceof Long) {
+ } else if (jobResult instanceof Long) {
vol = _volsDao.findById((Long) jobResult);
}
}
@@ -2032,37 +2028,28 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) {
" as the storage pool is in maintenance mode.");
}
- if (_volumeMgr.volumeOnSharedStoragePool(vol)) {
- if (destPool.isLocal()) {
- throw new InvalidParameterValueException("Migration of volume from shared to local storage pool is not supported");
- } else {
- // If the volume is attached to a running vm and the volume is on a shared storage pool, check
- // to make sure that the destination storage pool is in the same cluster as the vm.
- if (liveMigrateVolume && destPool.getClusterId() != null && srcClusterId != null) {
- if (!srcClusterId.equals(destPool.getClusterId())) {
- throw new InvalidParameterValueException("Cannot migrate a volume of a virtual machine to a storage pool in a different cluster");
- }
+ if (liveMigrateVolume && destPool.getClusterId() != null && srcClusterId != null) {
+ if (!srcClusterId.equals(destPool.getClusterId())) {
+ throw new InvalidParameterValueException("Cannot migrate a volume of a virtual machine to a storage pool in a different cluster");
+ }
+ }
+ // In case of VMware, if ROOT volume is being cold-migrated, then ensure destination storage pool is in the same Datacenter as the VM.
+ if (vm != null && vm.getHypervisorType().equals(HypervisorType.VMware)) {
+ if (!liveMigrateVolume && vol.volumeType.equals(Volume.Type.ROOT)) {
+ Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId();
+ HostVO host = _hostDao.findById(hostId);
+ if (host != null) {
+ srcClusterId = host.getClusterId();
}
- // In case of VMware, if ROOT volume is being cold-migrated, then ensure destination storage pool is in the same Datacenter as the VM.
- if (vm != null && vm.getHypervisorType().equals(HypervisorType.VMware)) {
- if (!liveMigrateVolume && vol.volumeType.equals(Volume.Type.ROOT)) {
- Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId();
- HostVO host = _hostDao.findById(hostId);
- if (host != null)
- srcClusterId = host.getClusterId();
- if (srcClusterId != null && destPool.getClusterId() != null && !srcClusterId.equals(destPool.getClusterId())) {
- String srcDcName = _clusterDetailsDao.getVmwareDcName(srcClusterId);
- String destDcName = _clusterDetailsDao.getVmwareDcName(destPool.getClusterId());
- if (srcDcName != null && destDcName != null && !srcDcName.equals(destDcName)) {
- throw new InvalidParameterValueException("Cannot migrate ROOT volume of a stopped VM to a storage pool in a different VMware datacenter");
- }
- }
- updateMissingRootDiskController(vm, vol.getChainInfo());
+ if (srcClusterId != null && destPool.getClusterId() != null && !srcClusterId.equals(destPool.getClusterId())) {
+ String srcDcName = _clusterDetailsDao.getVmwareDcName(srcClusterId);
+ String destDcName = _clusterDetailsDao.getVmwareDcName(destPool.getClusterId());
+ if (srcDcName != null && destDcName != null && !srcDcName.equals(destDcName)) {
+ throw new InvalidParameterValueException("Cannot migrate ROOT volume of a stopped VM to a storage pool in a different VMware datacenter");
}
}
+ updateMissingRootDiskController(vm, vol.getChainInfo());
}
- } else {
- throw new InvalidParameterValueException("Migration of volume from local storage pool is not supported");
}
if (vm != null) {
@@ -2092,12 +2079,13 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) {
Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob());
if (jobResult != null) {
- if (jobResult instanceof ConcurrentOperationException)
+ if (jobResult instanceof ConcurrentOperationException) {
throw (ConcurrentOperationException)jobResult;
- else if (jobResult instanceof RuntimeException)
+ } else if (jobResult instanceof RuntimeException) {
throw (RuntimeException)jobResult;
- else if (jobResult instanceof Throwable)
+ } else if (jobResult instanceof Throwable) {
throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
+ }
}
// retrieve the migrated new volume from job result
@@ -2174,8 +2162,9 @@ public Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Acco
}
VMInstanceVO vm = null;
- if (volume.getInstanceId() != null)
+ if (volume.getInstanceId() != null) {
vm = _vmInstanceDao.findById(volume.getInstanceId());
+ }
if (vm != null) {
// serialize VM operation
@@ -2204,12 +2193,13 @@ public Snapshot takeSnapshot(Long volumeId, Long policyId, Long snapshotId, Acco
Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob());
if (jobResult != null) {
- if (jobResult instanceof ConcurrentOperationException)
+ if (jobResult instanceof ConcurrentOperationException) {
throw (ConcurrentOperationException)jobResult;
- else if (jobResult instanceof ResourceAllocationException)
+ } else if (jobResult instanceof ResourceAllocationException) {
throw (ResourceAllocationException)jobResult;
- else if (jobResult instanceof Throwable)
+ } else if (jobResult instanceof Throwable) {
throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
+ }
}
return _snapshotDao.findById(snapshotId);
@@ -2227,8 +2217,8 @@ else if (jobResult instanceof Throwable)
}
private Snapshot orchestrateTakeVolumeSnapshot(Long volumeId, Long policyId, Long snapshotId, Account account,
- boolean quiescevm, Snapshot.LocationType locationType, boolean asyncBackup)
- throws ResourceAllocationException {
+ boolean quiescevm, Snapshot.LocationType locationType, boolean asyncBackup)
+ throws ResourceAllocationException {
VolumeInfo volume = volFactory.getVolume(volumeId);
@@ -2448,12 +2438,13 @@ public String extractVolume(ExtractVolumeCmd cmd) {
Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob());
if (jobResult != null) {
- if (jobResult instanceof ConcurrentOperationException)
+ if (jobResult instanceof ConcurrentOperationException) {
throw (ConcurrentOperationException)jobResult;
- else if (jobResult instanceof RuntimeException)
+ } else if (jobResult instanceof RuntimeException) {
throw (RuntimeException)jobResult;
- else if (jobResult instanceof Throwable)
+ } else if (jobResult instanceof Throwable) {
throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
+ }
}
// retrieve the entity url from job result
@@ -2522,24 +2513,6 @@ public boolean isDisplayResourceEnabled(Long id) {
return volume.isDisplayVolume();
}
- private String getFormatForPool(StoragePool pool) {
- ClusterVO cluster = ApiDBUtils.findClusterById(pool.getClusterId());
-
- if (cluster.getHypervisorType() == HypervisorType.XenServer) {
- return "vhd";
- } else if (cluster.getHypervisorType() == HypervisorType.KVM) {
- return "qcow2";
- } else if (cluster.getHypervisorType() == HypervisorType.Hyperv) {
- return "vhdx";
- } else if (cluster.getHypervisorType() == HypervisorType.VMware) {
- return "ova";
- } else if (cluster.getHypervisorType() == HypervisorType.Ovm) {
- return "raw";
- } else {
- return null;
- }
- }
-
private boolean needMoveVolume(VolumeVO existingVolume, VolumeInfo newVolume) {
if (existingVolume == null || existingVolume.getPoolId() == null || newVolume.getPoolId() == null) {
return false;
@@ -2831,7 +2804,6 @@ private Long getDeviceId(UserVmVO vm, Long deviceId) {
@Override
public boolean configure(String name, Map<String, Object> params) {
-
String maxVolumeSizeInGbString = _configDao.getValue(Config.MaxVolumeSize.toString());
_maxVolumeSizeInGb = NumbersUtil.parseLong(maxVolumeSizeInGbString, 2000);
return true;
@@ -2847,15 +2819,15 @@ public void setStoragePoolAllocators(List<StoragePoolAllocator> storagePoolAlloc
}
public class VmJobVolumeUrlOutcome extends OutcomeImpl<String> {
-
public VmJobVolumeUrlOutcome(final AsyncJob job) {
super(String.class, job, VmJobCheckInterval.value(), new Predicate() {
@Override
public boolean checkCondition() {
AsyncJobVO jobVo = _entityMgr.findById(AsyncJobVO.class, job.getId());
assert (jobVo != null);
- if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS)
+ if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) {
return true;
+ }
return false;
}
@@ -2872,8 +2844,9 @@ public VmJobVolumeOutcome(final AsyncJob job, final long volumeId) {
public boolean checkCondition() {
AsyncJobVO jobVo = _entityMgr.findById(AsyncJobVO.class, job.getId());
assert (jobVo != null);
- if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS)
+ if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) {
return true;
+ }
return false;
}
@@ -2896,8 +2869,9 @@ public VmJobSnapshotOutcome(final AsyncJob job, final long snapshotId) {
public boolean checkCondition() {
AsyncJobVO jobVo = _entityMgr.findById(AsyncJobVO.class, job.getId());
assert (jobVo != null);
- if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS)
+ if (jobVo == null || jobVo.getStatus() != JobInfo.Status.IN_PROGRESS) {
return true;
+ }
return false;
}
@@ -2979,8 +2953,8 @@ protected Snapshot retrieve() {
}
public Outcome<Volume> resizeVolumeThroughJobQueue(final Long vmId, final long volumeId, final long currentSize, final long newSize,
- final Long newMinIops, final Long newMaxIops, final Integer newHypervisorSnapshotReserve,
- final Long newServiceOfferingId, final boolean shrinkOk) {
+ final Long newMinIops, final Long newMaxIops, final Integer newHypervisorSnapshotReserve,
+ final Long newServiceOfferingId, final boolean shrinkOk) {
final CallContext context = CallContext.current();
final User callingUser = context.getCallingUser();
final Account callingAccount = context.getCallingAccount();
@@ -3101,7 +3075,7 @@ protected Snapshot retrieve() {
// save work context info (there are some duplications)
VmWorkTakeVolumeSnapshot workInfo = new VmWorkTakeVolumeSnapshot(
callingUser.getId(), accountId != null ? accountId : callingAccount.getId(), vm.getId(),
- VolumeApiServiceImpl.VM_WORK_JOB_HANDLER, volumeId, policyId, snapshotId, quiesceVm, locationType, asyncBackup);
+ VolumeApiServiceImpl.VM_WORK_JOB_HANDLER, volumeId, policyId, snapshotId, quiesceVm, locationType, asyncBackup);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkConstants.VM_WORK_QUEUE, vm.getId());
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index dab741c3c27..722f8c24901 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -4995,21 +4995,22 @@ public VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool) {
private boolean isVMUsingLocalStorage(VMInstanceVO vm) {
boolean usesLocalStorage = false;
- ServiceOfferingVO svcOffering = _serviceOfferingDao.findById(vm.getId(), vm.getServiceOfferingId());
- if (svcOffering.getUseLocalStorage()) {
- usesLocalStorage = true;
- } else {
- List<VolumeVO> volumes = _volsDao.findByInstanceAndType(vm.getId(), Volume.Type.DATADISK);
- for (VolumeVO vol : volumes) {
- DiskOfferingVO diskOffering = _diskOfferingDao.findById(vol.getDiskOfferingId());
- if (diskOffering.getUseLocalStorage()) {
- usesLocalStorage = true;
- break;
- }
+
+ List<VolumeVO> volumes = _volsDao.findByInstance(vm.getId());
+ for (VolumeVO vol : volumes) {
+ DiskOfferingVO diskOffering = _diskOfferingDao.findById(vol.getDiskOfferingId());
+ if (diskOffering.getUseLocalStorage()) {
+ usesLocalStorage = true;
+ break;
+ }
+ StoragePoolVO storagePool = _storagePoolDao.findById(vol.getPoolId());
+ if (storagePool.isLocal()) {
+ usesLocalStorage = true;
+ break;
}
}
return usesLocalStorage;
- }
+}
@Override
@ActionEvent(eventType = EventTypes.EVENT_VM_MIGRATE, eventDescription = "migrating VM", async = true)
diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
index 16f39bcddff..286ec3cb7a7 100644
--- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
+++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
@@ -16,32 +16,21 @@
// under the License.
package com.cloud.storage;
-import com.cloud.dc.DataCenterVO;
-import com.cloud.dc.dao.DataCenterDao;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.org.Grouping;
-import com.cloud.serializer.GsonHelper;
-import com.cloud.storage.dao.VolumeDao;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.AccountVO;
-import com.cloud.user.User;
-import com.cloud.user.UserVO;
-import com.cloud.utils.db.TransactionLegacy;
-import com.cloud.vm.UserVmManager;
-import com.cloud.vm.UserVmVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
-import com.cloud.vm.dao.UserVmDao;
-import com.cloud.vm.dao.VMInstanceDao;
-import com.cloud.vm.snapshot.VMSnapshotVO;
-import com.cloud.vm.snapshot.dao.VMSnapshotDao;
-import com.cloud.user.dao.AccountDao;
-import com.cloud.user.ResourceLimitService;
-import com.cloud.configuration.Resource;
-import com.cloud.host.dao.HostDao;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
@@ -58,103 +47,103 @@
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.junit.Assert;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
-import javax.inject.Inject;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import com.cloud.configuration.Resource;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.org.Grouping;
+import com.cloud.serializer.GsonHelper;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountVO;
+import com.cloud.user.ResourceLimitService;
+import com.cloud.user.User;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.snapshot.VMSnapshotVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDao;
+@RunWith(MockitoJUnitRunner.class)
public class VolumeApiServiceImplTest {
- @Inject
- VolumeApiServiceImpl _svc = new VolumeApiServiceImpl();
+
+ @Spy
+ @InjectMocks
+ private VolumeApiServiceImpl volumeApiServiceImpl;
@Mock
- VolumeDao _volumeDao;
+ private VolumeDao _volumeDao;
@Mock
- AccountManager _accountMgr;
+ private AccountManager _accountMgr;
@Mock
- UserVmDao _userVmDao;
+ private UserVmDao _userVmDao;
@Mock
- PrimaryDataStoreDao _storagePoolDao;
+ private PrimaryDataStoreDao _storagePoolDao;
@Mock
- VMSnapshotDao _vmSnapshotDao;
+ private VMSnapshotDao _vmSnapshotDao;
@Mock
- AsyncJobManager _jobMgr;
+ private AsyncJobManager _jobMgr;
@Mock
- AsyncJobJoinMapDao _joinMapDao;
+ private AsyncJobJoinMapDao _joinMapDao;
@Mock
- VolumeDataFactory _volFactory;
-
+ private VolumeDataFactory _volFactory;
@Mock
- VMInstanceDao _vmInstanceDao;
+ private VMInstanceDao _vmInstanceDao;
@Mock
- VolumeInfo volumeInfoMock;
+ private VolumeInfo volumeInfoMock;
@Mock
- SnapshotInfo snapshotInfoMock;
+ private SnapshotInfo snapshotInfoMock;
@Mock
- VolumeService volService;
+ private VolumeService volService;
@Mock
- CreateVolumeCmd createVol;
+ private CreateVolumeCmd createVol;
@Mock
- UserVmManager _userVmMgr;
+ private UserVmManager userVmManager;
@Mock
- DataCenterDao _dcDao;
+ private DataCenterDao _dcDao;
@Mock
- ResourceLimitService _resourceLimitMgr;
+ private ResourceLimitService _resourceLimitMgr;
@Mock
- AccountDao _accountDao;
+ private AccountDao _accountDao;
@Mock
- HostDao _hostDao;
+ private HostDao _hostDao;
- DetachVolumeCmd detachCmd = new DetachVolumeCmd();
- Class<?> _detachCmdClass = detachCmd.getClass();
+ private DetachVolumeCmd detachCmd = new DetachVolumeCmd();
+ private Class<?> _detachCmdClass = detachCmd.getClass();
@Before
public void setup() throws Exception {
- MockitoAnnotations.initMocks(this);
- _svc._volsDao = _volumeDao;
- _svc._accountMgr = _accountMgr;
- _svc._userVmDao = _userVmDao;
- _svc._storagePoolDao = _storagePoolDao;
- _svc._vmSnapshotDao = _vmSnapshotDao;
- _svc._vmInstanceDao = _vmInstanceDao;
- _svc._jobMgr = _jobMgr;
- _svc.volFactory = _volFactory;
- _svc.volService = volService;
- _svc._userVmMgr = _userVmMgr;
- _svc._dcDao = _dcDao;
- _svc._resourceLimitMgr = _resourceLimitMgr;
- _svc._accountDao = _accountDao;
- _svc._hostDao = _hostDao;
- _svc._gson = GsonHelper.getGsonLogger();
+ volumeApiServiceImpl._gson = GsonHelper.getGsonLogger();
// mock caller context
AccountVO account = new AccountVO("admin", 1L, "networkDomain", Account.ACCOUNT_TYPE_NORMAL, "uuid");
- AccountVO account2 = new AccountVO("Account2", 2L, "networkDomain", Account.ACCOUNT_TYPE_NORMAL, "uuid");
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
CallContext.register(user, account);
// mock async context
AsyncJobExecutionContext context = new AsyncJobExecutionContext();
- AsyncJobExecutionContext.init(_svc._jobMgr, _joinMapDao);
+ AsyncJobExecutionContext.init(_jobMgr, _joinMapDao);
AsyncJobVO job = new AsyncJobVO();
context.setJob(job);
AsyncJobExecutionContext.setCurrentExecutionContext(context);
@@ -164,25 +153,25 @@ public void setup() throws Exception {
// volume of running vm id=1
VolumeVO volumeOfRunningVm = new VolumeVO("root", 1L, 1L, 1L, 1L, 1L, "root", "root", Storage.ProvisioningType.THIN, 1, null,
null, "root", Volume.Type.ROOT);
- when(_svc._volsDao.findById(1L)).thenReturn(volumeOfRunningVm);
+ when(_volumeDao.findById(1L)).thenReturn(volumeOfRunningVm);
UserVmVO runningVm = new UserVmVO(1L, "vm", "vm", 1, HypervisorType.XenServer, 1L, false,
false, 1L, 1L, 1, 1L, null, "vm", null);
runningVm.setState(State.Running);
runningVm.setDataCenterId(1L);
- when(_svc._userVmDao.findById(1L)).thenReturn(runningVm);
+ when(_userVmDao.findById(1L)).thenReturn(runningVm);
// volume of stopped vm id=2
VolumeVO volumeOfStoppedVm = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null,
null, "root", Volume.Type.ROOT);
volumeOfStoppedVm.setPoolId(1L);
- when(_svc._volsDao.findById(2L)).thenReturn(volumeOfStoppedVm);
+ when(_volumeDao.findById(2L)).thenReturn(volumeOfStoppedVm);
UserVmVO stoppedVm = new UserVmVO(2L, "vm", "vm", 1, HypervisorType.XenServer, 1L, false,
false, 1L, 1L, 1, 1L, null, "vm", null);
stoppedVm.setState(State.Stopped);
stoppedVm.setDataCenterId(1L);
- when(_svc._userVmDao.findById(2L)).thenReturn(stoppedVm);
+ when(_userVmDao.findById(2L)).thenReturn(stoppedVm);
// volume of hyperV vm id=3
@@ -190,31 +179,31 @@ public void setup() throws Exception {
false, 1L, 1L, 1, 1L, null, "vm", null);
hyperVVm.setState(State.Stopped);
hyperVVm.setDataCenterId(1L);
- when(_svc._userVmDao.findById(3L)).thenReturn(hyperVVm);
+ when(_userVmDao.findById(3L)).thenReturn(hyperVVm);
VolumeVO volumeOfStoppeHyperVVm = new VolumeVO("root", 1L, 1L, 1L, 1L, 3L, "root", "root", Storage.ProvisioningType.THIN, 1, null,
null, "root", Volume.Type.ROOT);
volumeOfStoppeHyperVVm.setPoolId(1L);
- when(_svc._volsDao.findById(3L)).thenReturn(volumeOfStoppeHyperVVm);
+ when(_volumeDao.findById(3L)).thenReturn(volumeOfStoppeHyperVVm);
StoragePoolVO unmanagedPool = new StoragePoolVO();
- when(_svc._storagePoolDao.findById(1L)).thenReturn(unmanagedPool);
+ when(_storagePoolDao.findById(1L)).thenReturn(unmanagedPool);
// volume of managed pool id=4
StoragePoolVO managedPool = new StoragePoolVO();
managedPool.setManaged(true);
- when(_svc._storagePoolDao.findById(2L)).thenReturn(managedPool);
+ when(_storagePoolDao.findById(2L)).thenReturn(managedPool);
VolumeVO managedPoolVolume = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null,
null, "root", Volume.Type.ROOT);
managedPoolVolume.setPoolId(2L);
- when(_svc._volsDao.findById(4L)).thenReturn(managedPoolVolume);
+ when(_volumeDao.findById(4L)).thenReturn(managedPoolVolume);
// non-root non-datadisk volume
VolumeInfo volumeWithIncorrectVolumeType = Mockito.mock(VolumeInfo.class);
when(volumeWithIncorrectVolumeType.getId()).thenReturn(5L);
when(volumeWithIncorrectVolumeType.getVolumeType()).thenReturn(Volume.Type.ISO);
- when(_svc.volFactory.getVolume(5L)).thenReturn(volumeWithIncorrectVolumeType);
+ when(_volFactory.getVolume(5L)).thenReturn(volumeWithIncorrectVolumeType);
// correct root volume
VolumeInfo correctRootVolume = Mockito.mock(VolumeInfo.class);
@@ -225,11 +214,11 @@ public void setup() throws Exception {
when(correctRootVolume.getState()).thenReturn(Volume.State.Ready);
when(correctRootVolume.getTemplateId()).thenReturn(null);
when(correctRootVolume.getPoolId()).thenReturn(1L);
- when(_svc.volFactory.getVolume(6L)).thenReturn(correctRootVolume);
+ when(_volFactory.getVolume(6L)).thenReturn(correctRootVolume);
VolumeVO correctRootVolumeVO = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null,
null, "root", Volume.Type.ROOT);
- when(_svc._volsDao.findById(6L)).thenReturn(correctRootVolumeVO);
+ when(_volumeDao.findById(6L)).thenReturn(correctRootVolumeVO);
// managed root volume
VolumeInfo managedVolume = Mockito.mock(VolumeInfo.class);
@@ -238,23 +227,23 @@ public void setup() throws Exception {
when(managedVolume.getVolumeType()).thenReturn(Volume.Type.ROOT);
when(managedVolume.getInstanceId()).thenReturn(null);
when(managedVolume.getPoolId()).thenReturn(2L);
- when(_svc.volFactory.getVolume(7L)).thenReturn(managedVolume);
+ when(_volFactory.getVolume(7L)).thenReturn(managedVolume);
VolumeVO managedVolume1 = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null,
null, "root", Volume.Type.ROOT);
managedVolume1.setPoolId(2L);
managedVolume1.setDataCenterId(1L);
- when(_svc._volsDao.findById(7L)).thenReturn(managedVolume1);
+ when(_volumeDao.findById(7L)).thenReturn(managedVolume1);
// vm having root volume
UserVmVO vmHavingRootVolume = new UserVmVO(4L, "vm", "vm", 1, HypervisorType.XenServer, 1L, false,
false, 1L, 1L, 1, 1L, null, "vm", null);
vmHavingRootVolume.setState(State.Stopped);
vmHavingRootVolume.setDataCenterId(1L);
- when(_svc._userVmDao.findById(4L)).thenReturn(vmHavingRootVolume);
+ when(_userVmDao.findById(4L)).thenReturn(vmHavingRootVolume);
List<VolumeVO> vols = new ArrayList<VolumeVO>();
vols.add(new VolumeVO());
- when(_svc._volsDao.findByInstanceAndDeviceId(4L, 0L)).thenReturn(vols);
+ when(_volumeDao.findByInstanceAndDeviceId(4L, 0L)).thenReturn(vols);
// volume in uploaded state
VolumeInfo uploadedVolume = Mockito.mock(VolumeInfo.class);
@@ -264,32 +253,32 @@ public void setup() throws Exception {
when(uploadedVolume.getInstanceId()).thenReturn(null);
when(uploadedVolume.getPoolId()).thenReturn(1L);
when(uploadedVolume.getState()).thenReturn(Volume.State.Uploaded);
- when(_svc.volFactory.getVolume(8L)).thenReturn(uploadedVolume);
+ when(_volFactory.getVolume(8L)).thenReturn(uploadedVolume);
VolumeVO upVolume = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null,
null, "root", Volume.Type.ROOT);
upVolume.setPoolId(1L);
upVolume.setDataCenterId(1L);
upVolume.setState(Volume.State.Uploaded);
- when(_svc._volsDao.findById(8L)).thenReturn(upVolume);
+ when(_volumeDao.findById(8L)).thenReturn(upVolume);
// helper dao methods mock
- when(_svc._vmSnapshotDao.findByVm(any(Long.class))).thenReturn(new ArrayList<VMSnapshotVO>());
- when(_svc._vmInstanceDao.findById(any(Long.class))).thenReturn(stoppedVm);
+ when(_vmSnapshotDao.findByVm(any(Long.class))).thenReturn(new ArrayList<VMSnapshotVO>());
+ when(_vmInstanceDao.findById(any(Long.class))).thenReturn(stoppedVm);
DataCenterVO enabledZone = Mockito.mock(DataCenterVO.class);
when(enabledZone.getAllocationState()).thenReturn(Grouping.AllocationState.Enabled);
- when(_svc._dcDao.findById(anyLong())).thenReturn(enabledZone);
+ when(_dcDao.findById(anyLong())).thenReturn(enabledZone);
} finally {
txn.close("runVolumeDaoImplTest");
}
// helper methods mock
- doNothing().when(_svc._accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
- doNothing().when(_svc._jobMgr).updateAsyncJobAttachment(any(Long.class), any(String.class), any(Long.class));
- when(_svc._jobMgr.submitAsyncJob(any(AsyncJobVO.class), any(String.class), any(Long.class))).thenReturn(1L);
+ doNothing().when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
+ doNothing().when(_jobMgr).updateAsyncJobAttachment(any(Long.class), any(String.class), any(Long.class));
+ when(_jobMgr.submitAsyncJob(any(AsyncJobVO.class), any(String.class), any(Long.class))).thenReturn(1L);
}
/**
@@ -302,7 +291,7 @@ public void testDetachVolumeFromRunningVm() throws NoSuchFieldException, Illegal
Field dedicateIdField = _detachCmdClass.getDeclaredField("id");
dedicateIdField.setAccessible(true);
dedicateIdField.set(detachCmd, 1L);
- _svc.detachVolumeFromVM(detachCmd);
+ volumeApiServiceImpl.detachVolumeFromVM(detachCmd);
}
@Test(expected = InvalidParameterValueException.class)
@@ -310,7 +299,7 @@ public void testDetachVolumeFromStoppedHyperVVm() throws NoSuchFieldException, I
Field dedicateIdField = _detachCmdClass.getDeclaredField("id");
dedicateIdField.setAccessible(true);
dedicateIdField.set(detachCmd, 3L);
- _svc.detachVolumeFromVM(detachCmd);
+ volumeApiServiceImpl.detachVolumeFromVM(detachCmd);
}
@Test(expected = InvalidParameterValueException.class)
@@ -318,7 +307,7 @@ public void testDetachVolumeOfManagedDataStore() throws NoSuchFieldException, Il
Field dedicateIdField = _detachCmdClass.getDeclaredField("id");
dedicateIdField.setAccessible(true);
dedicateIdField.set(detachCmd, 4L);
- _svc.detachVolumeFromVM(detachCmd);
+ volumeApiServiceImpl.detachVolumeFromVM(detachCmd);
}
@Rule
@@ -330,7 +319,7 @@ public void testDetachVolumeFromStoppedXenVm() throws NoSuchFieldException, Ille
Field dedicateIdField = _detachCmdClass.getDeclaredField("id");
dedicateIdField.setAccessible(true);
dedicateIdField.set(detachCmd, 2L);
- _svc.detachVolumeFromVM(detachCmd);
+ volumeApiServiceImpl.detachVolumeFromVM(detachCmd);
}
/**
@@ -340,44 +329,44 @@ public void testDetachVolumeFromStoppedXenVm() throws NoSuchFieldException, Ille
// Negative test - try to attach non-root non-datadisk volume
@Test(expected = InvalidParameterValueException.class)
public void attachIncorrectDiskType() throws NoSuchFieldException, IllegalAccessException {
- _svc.attachVolumeToVM(1L, 5L, 0L);
+ volumeApiServiceImpl.attachVolumeToVM(1L, 5L, 0L);
}
// Negative test - attach root volume to running vm
@Test(expected = InvalidParameterValueException.class)
public void attachRootDiskToRunningVm() throws NoSuchFieldException, IllegalAccessException {
- _svc.attachVolumeToVM(1L, 6L, 0L);
+ volumeApiServiceImpl.attachVolumeToVM(1L, 6L, 0L);
}
// Negative test - attach root volume to non-xen vm
@Test(expected = InvalidParameterValueException.class)
public void attachRootDiskToHyperVm() throws NoSuchFieldException, IllegalAccessException {
- _svc.attachVolumeToVM(3L, 6L, 0L);
+ volumeApiServiceImpl.attachVolumeToVM(3L, 6L, 0L);
}
// Negative test - attach root volume from the managed data store
@Test(expected = InvalidParameterValueException.class)
public void attachRootDiskOfManagedDataStore() throws NoSuchFieldException, IllegalAccessException {
- _svc.attachVolumeToVM(2L, 7L, 0L);
+ volumeApiServiceImpl.attachVolumeToVM(2L, 7L, 0L);
}
// Negative test - root volume can't be attached to the vm already having a root volume attached
@Test(expected = InvalidParameterValueException.class)
public void attachRootDiskToVmHavingRootDisk() throws NoSuchFieldException, IllegalAccessException {
- _svc.attachVolumeToVM(4L, 6L, 0L);
+ volumeApiServiceImpl.attachVolumeToVM(4L, 6L, 0L);
}
// Negative test - root volume in uploaded state can't be attached
@Test(expected = InvalidParameterValueException.class)
public void attachRootInUploadedState() throws NoSuchFieldException, IllegalAccessException {
- _svc.attachVolumeToVM(2L, 8L, 0L);
+ volumeApiServiceImpl.attachVolumeToVM(2L, 8L, 0L);
}
// Positive test - attach ROOT volume in correct state, to the vm not having root volume attached
@Test
public void attachRootVolumePositive() throws NoSuchFieldException, IllegalAccessException {
thrown.expect(NullPointerException.class);
- _svc.attachVolumeToVM(2L, 6L, 0L);
+ volumeApiServiceImpl.attachVolumeToVM(2L, 6L, 0L);
}
// volume not Ready
@@ -386,7 +375,7 @@ public void testTakeSnapshotF1() throws ResourceAllocationException {
when(_volFactory.getVolume(anyLong())).thenReturn(volumeInfoMock);
when(volumeInfoMock.getState()).thenReturn(Volume.State.Allocated);
when(volumeInfoMock.getPoolId()).thenReturn(1L);
- _svc.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false);
+ volumeApiServiceImpl.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false);
}
@Test
@@ -396,45 +385,46 @@ public void testTakeSnapshotF2() throws ResourceAllocationException {
when(volumeInfoMock.getInstanceId()).thenReturn(null);
when(volumeInfoMock.getPoolId()).thenReturn(1L);
when (volService.takeSnapshot(Mockito.any(VolumeInfo.class))).thenReturn(snapshotInfoMock);
- _svc.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false);
+ volumeApiServiceImpl.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false);
}
@Test
public void testNullGetVolumeNameFromCmd() {
when(createVol.getVolumeName()).thenReturn(null);
- Assert.assertNotNull(_svc.getVolumeNameFromCommand(createVol));
+ Assert.assertNotNull(volumeApiServiceImpl.getVolumeNameFromCommand(createVol));
}
@Test
public void testEmptyGetVolumeNameFromCmd() {
when(createVol.getVolumeName()).thenReturn("");
- Assert.assertNotNull(_svc.getVolumeNameFromCommand(createVol));
+ Assert.assertNotNull(volumeApiServiceImpl.getVolumeNameFromCommand(createVol));
}
@Test
public void testBlankGetVolumeNameFromCmd() {
when(createVol.getVolumeName()).thenReturn(" ");
- Assert.assertNotNull(_svc.getVolumeNameFromCommand(createVol));
+ Assert.assertNotNull(volumeApiServiceImpl.getVolumeNameFromCommand(createVol));
}
@Test
public void testNonEmptyGetVolumeNameFromCmd() {
when(createVol.getVolumeName()).thenReturn("abc");
- Assert.assertSame(_svc.getVolumeNameFromCommand(createVol), "abc");
+ Assert.assertSame(volumeApiServiceImpl.getVolumeNameFromCommand(createVol), "abc");
}
@Test
public void testUpdateMissingRootDiskControllerWithNullChainInfo() {
- _svc.updateMissingRootDiskController(null, null);
- verify(_svc._userVmMgr, times(0)).persistDeviceBusInfo(any(UserVmVO.class), anyString());
+ volumeApiServiceImpl.updateMissingRootDiskController(null, null);
+ verify(userVmManager, times(0)).persistDeviceBusInfo(any(UserVmVO.class), anyString());
}
@Test
public void testUpdateMissingRootDiskControllerWithValidChainInfo() {
- UserVmVO vm = _svc._userVmDao.findById(1L);
- assert vm.getType() == VirtualMachine.Type.User;
- _svc.updateMissingRootDiskController(vm, "{\"diskDeviceBusName\":\"scsi0:0\",\"diskChain\":[\"[somedatastore] i-3-VM-somePath/ROOT-1.vmdk\"]}");
- verify(_svc._userVmMgr, times(1)).persistDeviceBusInfo(any(UserVmVO.class), eq("scsi"));
+ UserVmVO vm = _userVmDao.findById(1L);
+
+ Mockito.doNothing().when(userVmManager).persistDeviceBusInfo(any(UserVmVO.class), eq("scsi"));
+ volumeApiServiceImpl.updateMissingRootDiskController(vm, "{\"diskDeviceBusName\":\"scsi0:0\",\"diskChain\":[\"[somedatastore] i-3-VM-somePath/ROOT-1.vmdk\"]}");
+ verify(userVmManager, times(1)).persistDeviceBusInfo(any(UserVmVO.class), eq("scsi"));
}
@Test
@@ -443,7 +433,7 @@ public void testUpdateMissingRootDiskControllerWithValidChainInfo() {
*/
public void testAllocSnapshotNonManagedStorageArchive() {
try {
- _svc.allocSnapshot(6L, 1L, "test", Snapshot.LocationType.SECONDARY);
+ volumeApiServiceImpl.allocSnapshot(6L, 1L, "test", Snapshot.LocationType.SECONDARY);
} catch (InvalidParameterValueException e) {
Assert.assertEquals(e.getMessage(), "VolumeId: 6 LocationType is supported only for managed storage");
return;
@@ -462,7 +452,8 @@ public void testAllocSnapshotNonManagedStorageArchive() {
*/
@Test
public void testResourceLimitCheckForUploadedVolume() throws NoSuchFieldException, IllegalAccessException, ResourceAllocationException {
- doThrow(new ResourceAllocationException("primary storage resource limit check failed", Resource.ResourceType.primary_storage)).when(_svc._resourceLimitMgr).checkResourceLimit(any(AccountVO.class), any(Resource.ResourceType.class), any(Long.class));
+ doThrow(new ResourceAllocationException("primary storage resource limit check failed", Resource.ResourceType.primary_storage)).when(_resourceLimitMgr).checkResourceLimit(any(AccountVO.class),
+ any(Resource.ResourceType.class), any(Long.class));
UserVmVO vm = Mockito.mock(UserVmVO.class);
VolumeInfo volumeToAttach = Mockito.mock(VolumeInfo.class);
when(volumeToAttach.getId()).thenReturn(9L);
@@ -473,14 +464,14 @@ public void testResourceLimitCheckForUploadedVolume() throws NoSuchFieldExceptio
when(vm.getType()).thenReturn(VirtualMachine.Type.User);
when(vm.getState()).thenReturn(State.Running);
when(vm.getDataCenterId()).thenReturn(34L);
- when(_svc._volsDao.findByInstanceAndType(anyLong(), any(Volume.Type.class))).thenReturn(new ArrayList(10));
- when(_svc.volFactory.getVolume(9L)).thenReturn(volumeToAttach);
+ when(_volumeDao.findByInstanceAndType(anyLong(), any(Volume.Type.class))).thenReturn(new ArrayList<>(10));
+ when(_volFactory.getVolume(9L)).thenReturn(volumeToAttach);
when(volumeToAttach.getState()).thenReturn(Volume.State.Uploaded);
DataCenterVO zoneWithDisabledLocalStorage = Mockito.mock(DataCenterVO.class);
- when(_svc._dcDao.findById(anyLong())).thenReturn(zoneWithDisabledLocalStorage);
+ when(_dcDao.findById(anyLong())).thenReturn(zoneWithDisabledLocalStorage);
when(zoneWithDisabledLocalStorage.isLocalStorageEnabled()).thenReturn(true);
try {
- _svc.attachVolumeToVM(2L, 9L, null);
+ volumeApiServiceImpl.attachVolumeToVM(2L, 9L, null);
} catch (InvalidParameterValueException e) {
Assert.assertEquals(e.getMessage(), ("primary storage resource limit check failed"));
}
diff --git a/setup/db/hypervisor_capabilities.simulator.sql b/setup/db/hypervisor_capabilities.simulator.sql
index 32f9aaa7351..f0644f7ae08 100755
--- a/setup/db/hypervisor_capabilities.simulator.sql
+++ b/setup/db/hypervisor_capabilities.simulator.sql
@@ -16,4 +16,4 @@
-- under the License.
-INSERT INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'Simulator', 'default', 50, 1, 6, NULL, 0, 1);
+INSERT INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'Simulator', 'default', 50, 1, 6, NULL, 1, 1);
diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py
index 882df3c22b9..707d0b95fcd 100644
--- a/test/integration/smoke/test_primary_storage.py
+++ b/test/integration/smoke/test_primary_storage.py
@@ -43,11 +43,7 @@ def setUp(self):
self.pod = get_pod(self.apiclient, self.zone.id)
self.hypervisor = self.testClient.getHypervisorInfo()
self.domain = get_domain(self.apiclient)
- self.template = get_template(
- self.apiclient ,
- self.zone.id ,
- self.services["ostype"]
- )
+ self.template = get_template(self.apiclient, self.zone.id, self.services["ostype"])
return
@@ -383,11 +379,7 @@ def setUpClass(cls):
cls.pod = get_pod(cls.apiclient, cls.zone.id)
cls.hypervisor = testClient.getHypervisorInfo()
cls.domain = get_domain(cls.apiclient)
- cls.template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
+ cls.template = get_template(cls.apiclient, cls.zone.id, cls.services["ostype"])
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.services["storage_tags"] = StorageTagsServices().storage_tags
@@ -477,17 +469,18 @@ def tearDownClass(cls):
try:
# First expunge vm, so PS can be cleaned up
cls.virtual_machine_1.delete(cls.apiclient)
+ time.sleep(60)
# Force delete primary storage
cmd = enableStorageMaintenance.enableStorageMaintenanceCmd()
cmd.id = cls.storage_pool_1.id
cls.apiclient.enableStorageMaintenance(cmd)
- time.sleep(30)
+ time.sleep(45)
cmd = deleteStoragePool.deleteStoragePoolCmd()
cmd.id = cls.storage_pool_1.id
cmd.forced = True
cls.apiclient.deleteStoragePool(cmd)
-
+ time.sleep(30)
cleanup_resources(cls.apiclient, cls._cleanup)
except Exception as e:
raise Exception("Cleanup failed with %s" % e)
@@ -660,12 +653,23 @@ def test_03_migration_options_storage_tags(self):
if self.hypervisor.lower() not in ["vmware", "xenserver"]:
self.virtual_machine_1.stop(self.apiclient)
+ volumePool = StoragePool.list(
+ self.apiclient,
+ id=vol.storageid
+ )
+ self.debug("Volume %s is on storage: %s" % (vol.id, volumePool))
+ allStoragePools = StoragePool.list(
+ self.apiclient
+ )
+ self.debug("All storage pools in the system: %s" % (allStoragePools))
# Check migration options for volume
pools_response = StoragePool.listForMigration(
self.apiclient,
id=vol.id
)
pools_suitable = filter(lambda p : p.suitableformigration, pools_response)
+
+ self.debug("Suitable storage pools found: %s" % len(pools_suitable))
self.assertEquals(1, len(pools_suitable), "Check that there is only one item on the list")
self.assertEquals(pools_suitable[0].id, storage_pool_2.id, "Check that PS-2 is the migration option for volume")
@@ -682,6 +686,8 @@ def test_03_migration_options_storage_tags(self):
id=vol.id
)
pools_suitable = filter(lambda p : p.suitableformigration, pools_response)
+
+ self.debug("Suitable storage pools found: %s" % len(pools_suitable))
self.assertEquals(0, len(pools_suitable), "Check that there is no migration option for volume")
return
\ No newline at end of file
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services