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

migration complete

This commit is contained in:
Alex Huang 2011-01-14 15:11:05 -08:00
parent d43717eef8
commit 42950f2e8b
7 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
View File

@ -687,7 +687,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
long vmId = work.getInstanceId();
long srcHostId = work.getHostId();
try {
if (!_itMgr.migrate(work.getType(), vmId, srcHostId)) {
if (!_itMgr.migrateAway(work.getType(), vmId, srcHostId)) {
s_logger.warn("Unable to migrate vm from " + srcHostId);
_agentMgr.maintenanceFailed(srcHostId);
}

2
server/src/com/cloud/network/NetworkManager.java
View File

@ -144,4 +144,6 @@ public interface NetworkManager extends NetworkService {
Pair<NetworkGuru, NetworkVO> implementNetwork(long networkId, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
List<NetworkVO> listNetworksUsedByVm(long vmId, boolean isSystem);
<T extends VMInstanceVO> void prepareNicForMigration(VirtualMachineProfile<T> vm, DeployDestination dest);
}

13
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -1097,6 +1097,19 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
_networksDao.changeActiveNicsBy(network.getId(), 1);
}
}
@Override
public <T extends VMInstanceVO> void prepareNicForMigration(VirtualMachineProfile<T> vm, DeployDestination dest) {
List<NicVO> nics = _nicDao.listBy(vm.getId());
for (NicVO nic : nics) {
Network network = _networksDao.findById(nic.getNetworkId());
NicProfile profile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri());
vm.addNic(profile);
}
}
@Override
public void release(VirtualMachineProfile<? extends VMInstanceVO> vmProfile, boolean forced) {

2
server/src/com/cloud/storage/StorageManager.java
View File

@ -275,4 +275,6 @@ public interface StorageManager extends Manager {
void release(VirtualMachineProfile<? extends VMInstanceVO> profile);
void cleanupVolumes(long vmId) throws ConcurrentOperationException;
void prepareForMigration(VirtualMachineProfile<? extends VirtualMachine> vm, DeployDestination dest);
}

13
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -2558,6 +2558,19 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
return null;
}
@Override
public void prepareForMigration(VirtualMachineProfile<? extends VirtualMachine> vm, DeployDestination dest) {
List<VolumeVO> vols = _volsDao.findUsableVolumesForInstance(vm.getId());
if (s_logger.isDebugEnabled()) {
s_logger.debug("Preparing " + vols.size() + " volumes for " + vm);
}
for (VolumeVO vol : vols) {
StoragePool pool = _storagePoolDao.findById(vol.getPoolId());
vm.addDisk(new VolumeTO(vol, pool));
}
}
@Override
public void prepare(VirtualMachineProfile<? extends VirtualMachine> vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException {
List<VolumeVO> vols = _volsDao.findUsableVolumesForInstance(vm.getId());

2
server/src/com/cloud/vm/VirtualMachineManager.java
View File

@ -92,7 +92,7 @@ public interface VirtualMachineManager extends Manager {
<T extends VMInstanceVO> boolean destroy(T vm, User caller, Account account) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException;
boolean migrate(VirtualMachine.Type type, long vmid, long hostId) throws InsufficientServerCapacityException;
boolean migrateAway(VirtualMachine.Type type, long vmid, long hostId) throws InsufficientServerCapacityException;
<T extends VMInstanceVO> T migrate(T vm, long srcHostId, DeployDestination dest) throws ResourceUnavailableException;
}

15
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -84,6 +84,7 @@ import com.cloud.storage.Volume.VolumeType;
import com.cloud.storage.dao.GuestOSCategoryDao;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.User;
@ -139,6 +140,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
@Inject protected AlertManager _alertMgr;
@Inject protected GuestOSCategoryDao _guestOsCategoryDao;
@Inject protected GuestOSDao _guestOsDao;
@Inject protected VolumeDao _volsDao;
@Inject(adapter=DeploymentPlanner.class)
protected Adapters<DeploymentPlanner> _planners;
@ -364,8 +366,6 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
//Clean up volumes based on the vm's instance id
_storageMgr.cleanupVolumes(vm.getId());
_vmDao.remove(vm.getId());
if (s_logger.isDebugEnabled()) {
s_logger.debug("Expunged " + vm);
}
@ -863,6 +863,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
return true;
}
@Override
public <T extends VMInstanceVO> T migrate(T vm, long srcHostId, DeployDestination dest) throws ResourceUnavailableException {
s_logger.info("Migrating " + vm + " to " + dest);
@ -890,7 +891,10 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
alertType = AlertManager.ALERT_TYPE_CONSOLE_PROXY_MIGRATE;
}
VirtualMachineProfile<VMInstanceVO> profile = new VirtualMachineProfileImpl<VMInstanceVO>(vm);
VirtualMachineProfile<VMInstanceVO> profile = new VirtualMachineProfileImpl<VMInstanceVO>(vm);
_networkMgr.prepareNicForMigration(profile, dest);
_storageMgr.prepareForMigration(profile, dest);
HypervisorGuru hvGuru = _hvGurus.get(vm.getHypervisorType());
VirtualMachineTO to = hvGuru.implement(profile);
PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);
@ -915,7 +919,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
boolean isWindows = _guestOsCategoryDao.findById(_guestOsDao.findById(vm.getGuestOSId()).getCategoryId()).getName().equalsIgnoreCase("Windows");
MigrateCommand mc = new MigrateCommand(vm.getInstanceName(), dest.getHost().getPrivateIpAddress(), isWindows);
MigrateAnswer ma = (MigrateAnswer)_agentMgr.send(vm.getHostId(), mc);
MigrateAnswer ma = (MigrateAnswer)_agentMgr.send(vm.getLastHostId(), mc);
if (!ma.getResult()) {
return null;
}
@ -960,7 +964,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
}
@Override
public boolean migrate(VirtualMachine.Type vmType, long vmId, long srcHostId) throws InsufficientServerCapacityException {
public boolean migrateAway(VirtualMachine.Type vmType, long vmId, long srcHostId) throws InsufficientServerCapacityException {
VirtualMachineGuru<? extends VMInstanceVO> vmGuru = _vmGurus.get(vmType);
VMInstanceVO vm = vmGuru.findById(vmId);
if (vm == null) {
@ -973,6 +977,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
Long hostId = vm.getHostId();
if (hostId == null) {
s_logger.debug("Unable to migrate because the VM doesn't have a host id: " + vm);
return true;
}
Host host = _hostDao.findById(hostId);