apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

add new option to force destroy vm when delete host, if the VMs are created on local storage

Browse Source
This commit is contained in:
Edison Su 2011-07-08 13:49:05 -07:00
parent 97d03ce9ee
commit a24eef5c81
12 changed files with 129 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/api/ApiConstants.java
View File

@ -64,6 +64,7 @@ public class ApiConstants {
public static final String ENTRY_TIME = "entrytime";
public static final String FIRSTNAME = "firstname";
public static final String FORCED = "forced";
public static final String FORCED_DESTRORY_VM = "forcedestroyvm";
public static final String FORMAT = "format";
public static final String FOR_VIRTUAL_NETWORK = "forvirtualnetwork";
public static final String GATEWAY = "gateway";

9
api/src/com/cloud/api/commands/DeleteHostCmd.java
View File

@ -44,6 +44,9 @@ public class DeleteHostCmd extends BaseCmd {
@Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN, description = "Force delete the host. All HA enabled vms running on the host will be put to HA; HA disabled ones will be stopped")
private Boolean forced;
@Parameter(name = ApiConstants.FORCED_DESTRORY_VM, type = CommandType.BOOLEAN, description = "Force destroy VMs on this host. All VMs created on this local storage will be destroyed")
private Boolean forceDestroyVM;
// ///////////////////////////////////////////////////
// ///////////////// Accessors ///////////////////////
// ///////////////////////////////////////////////////
@ -56,6 +59,10 @@ public class DeleteHostCmd extends BaseCmd {
return (forced != null) ? forced : false;
}
public boolean isForceDestoryVM() {
return (forceDestroyVM != null) ? forceDestroyVM : false;
}
// ///////////////////////////////////////////////////
// ///////////// API Implementation///////////////////
// ///////////////////////////////////////////////////
@ -72,7 +79,7 @@ public class DeleteHostCmd extends BaseCmd {
@Override
public void execute() {
boolean result = _resourceService.deleteHost(getId(), isForced());
boolean result = _resourceService.deleteHost(getId(), isForced(), isForceDestoryVM());
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);

2
api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java
View File

@ -99,7 +99,7 @@ public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException{
StoragePool result = _storageService.preparePrimaryStorageForMaintenance(this);
StoragePool result = _storageService.preparePrimaryStorageForMaintenance(getId());
if (result != null){
StoragePoolResponse response = _responseGenerator.createStoragePoolResponse(result);
response.setResponseName("storagepool");

2
api/src/com/cloud/resource/ResourceService.java
View File

@ -79,7 +79,7 @@ public interface ResourceService {
*
* @param true if deleted, false otherwise
*/
boolean deleteHost(long hostId, boolean isForced);
boolean deleteHost(long hostId, boolean isForced, boolean isForceDeleteStorage);
boolean updateHostPassword(UpdateHostPasswordCmd upasscmd);

2
api/src/com/cloud/storage/StorageService.java
View File

@ -89,7 +89,7 @@ public interface StorageService {
* @throws InsufficientCapacityException
* TODO
*/
public StoragePool preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException;
public StoragePool preparePrimaryStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException, InsufficientCapacityException;
/**
* Complete maintenance for primary storage

2
server/src/com/cloud/agent/AgentManager.java
View File

@ -206,7 +206,7 @@ public interface AgentManager extends Manager {
* TODO
* @param true if deleted, false otherwise
*/
boolean deleteHost(long hostId, boolean isForced, User caller);
boolean deleteHost(long hostId, boolean isForced, boolean forceDestroy, User caller);
/**
* Find a pod based on the user id, template, and data center.

48
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -120,10 +120,17 @@ import com.cloud.network.dao.IPAddressDao;
import com.cloud.resource.ServerResource;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.Storage;
import com.cloud.storage.StorageManager;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolHostVO;
import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.StorageService;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.storage.dao.StoragePoolHostDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.resource.DummySecondaryStorageResource;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.AccountManager;
@ -212,6 +219,8 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
protected ClusterDetailsDao _clusterDetailsDao = null;
@Inject
protected HostTagsDao _hostTagsDao = null;
@Inject
protected VolumeDao _volumeDao = null;
protected int _port;
@ -226,6 +235,9 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
@Inject
protected VirtualMachineManager _vmMgr = null;
@Inject StorageService _storageSvr = null;
@Inject StorageManager _storageMgr = null;
protected int _retry = 2;
protected String _name;
@ -569,7 +581,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
@Override
@DB
public boolean deleteHost(long hostId, boolean isForced, User caller) {
public boolean deleteHost(long hostId, boolean isForced, boolean forceDestroy, User caller) {
// Check if the host exists
HostVO host = _hostDao.findById(hostId);
@ -590,7 +602,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
// Check if host is ready for removal
Status currentState = host.getStatus();
Status nextState = currentState.getNextStatus(Status.Event.Remove);
if (nextState == null && !isForced) {
if (nextState == null) {
s_logger.debug("There is no transition from state " + currentState.toString() + " to state " + Status.Event.Remove.toString());
return false;
}
@ -599,9 +611,34 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
s_logger.debug("Deleting Host: " + hostId + " Guid:" + host.getGuid());
}
if (forceDestroy) {
//put local storage into mainenance mode, will set all the VMs on this local storage into stopped state
StoragePool storagePool = _storageMgr.findLocalStorageOnHost(host.getId());
if (storagePool != null) {
if (storagePool.getStatus() == StoragePoolStatus.Up || storagePool.getStatus() == StoragePoolStatus.ErrorInMaintenance) {
try {
storagePool = _storageSvr.preparePrimaryStorageForMaintenance(storagePool.getId());
if (storagePool == null) {
s_logger.debug("Failed to set primary storage into maintenance mode");
return false;
}
} catch (Exception e) {
s_logger.debug("Failed to set primary storage into maintenance mode, due to: " + e.toString());
return false;
}
}
List<VMInstanceVO> vmsOnLocalStorage = _storageMgr.listByStoragePool(storagePool.getId());
for (VMInstanceVO vm : vmsOnLocalStorage) {
if(!_vmMgr.destroy(vm, caller, _accountMgr.getAccount(vm.getAccountId()))) {
String errorMsg = "There was an error Destory the vm: " + vm + " as a part of hostDelete id=" + hostId;
s_logger.warn(errorMsg);
throw new CloudRuntimeException(errorMsg);
}
}
}
} else {
// Check if there are vms running/starting/stopping on this host
List<VMInstanceVO> vms = _vmDao.listByHostId(hostId);
if (!vms.isEmpty()) {
if (isForced) {
// Stop HA disabled vms and HA enabled vms in Stopping state
@ -623,6 +660,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
throw new CloudRuntimeException("Unable to delete the host as there are vms in " + vms.get(0).getState() + " state using this host and isForced=false specified");
}
}
}
if (host.getHypervisorType() == HypervisorType.XenServer) {
if (host.getClusterId() != null) {
@ -701,7 +739,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
for (StoragePoolHostVO pool : pools) {
Long poolId = pool.getPoolId();
StoragePoolVO storagePool = _storagePoolDao.findById(poolId);
if (storagePool.isLocal()) {
if (storagePool.isLocal() && forceDestroy) {
storagePool.setUuid(null);
storagePool.setClusterId(null);
_storagePoolDao.update(poolId, storagePool);
@ -1510,7 +1548,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
return cancelMaintenance(hostId);
} else if (event == Event.Remove) {
User caller = _accountMgr.getActiveUser(User.UID_SYSTEM);
return deleteHost(hostId, false, caller);
return deleteHost(hostId, false, false, caller);
} else if (event == Event.AgentDisconnected) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Received agent disconnect event for host " + hostId);

4
server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
View File

@ -356,7 +356,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
@Override
@DB
public boolean deleteHost(long hostId, boolean isForced, User caller) {
public boolean deleteHost(long hostId, boolean isForced, boolean forceDestroy, User caller) {
try {
Boolean result = _clusterMgr.propagateAgentEvent(hostId, Event.Remove);
if (result != null) {
@ -366,7 +366,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
return false;
}
return super.deleteHost(hostId, isForced, caller);
return super.deleteHost(hostId, isForced, forceDestroy, caller);
}
@Override

4
server/src/com/cloud/resource/ResourceManagerImpl.java
View File

@ -529,7 +529,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
}
@Override
public boolean deleteHost(long hostId, boolean isForced) {
public boolean deleteHost(long hostId, boolean isForced, boolean forceDestroy) {
User caller = _accountMgr.getActiveUser(UserContext.current().getCallerUserId());
// Verify that host exists
HostVO host = _hostDao.findById(hostId);
@ -541,7 +541,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
_secondaryStorageMgr.deleteHost(hostId);
return true;
} else {
return _agentMgr.deleteHost(hostId, isForced, caller);
return _agentMgr.deleteHost(hostId, isForced, forceDestroy, caller);
}
}

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

@ -202,4 +202,7 @@ public interface StorageManager extends Manager {
List<StoragePoolVO> ListByDataCenterHypervisor(long datacenterId, HypervisorType type);
VMTemplateHostVO getTemplateHostRef(long zoneId, long tmpltId, boolean readyOnly);
List<VMInstanceVO> listByStoragePool(long storagePoolId);
StoragePoolVO findLocalStorageOnHost(long hostId);
}

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

@ -282,6 +282,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
protected StoragePoolWorkDao _storagePoolWorkDao;
@Inject
protected HypervisorGuruManager _hvGuruMgr;
@Inject
protected VolumeDao _volumeDao;
@Inject(adapter = StoragePoolAllocator.class)
protected Adapters<StoragePoolAllocator> _storagePoolAllocators;
@ -290,6 +292,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
protected SearchBuilder<VMTemplateHostVO> HostTemplateStatesSearch;
protected GenericSearchBuilder<StoragePoolHostVO, Long> UpHostsInPoolSearch;
protected SearchBuilder<VMInstanceVO> StoragePoolSearch;
protected SearchBuilder<StoragePoolVO> LocalStorageSearch;
ScheduledExecutorService _executor = null;
boolean _storageCleanupEnabled;
@ -864,6 +868,20 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
UpHostsInPoolSearch.and("pool", UpHostsInPoolSearch.entity().getPoolId(), Op.EQ);
UpHostsInPoolSearch.done();
StoragePoolSearch = _vmInstanceDao.createSearchBuilder();
SearchBuilder<VolumeVO> volumeSearch = _volumeDao.createSearchBuilder();
volumeSearch.and("volumeType", volumeSearch.entity().getVolumeType(), SearchCriteria.Op.EQ);
volumeSearch.and("poolId", volumeSearch.entity().getPoolId(), SearchCriteria.Op.EQ);
StoragePoolSearch.join("vmVolume", volumeSearch, volumeSearch.entity().getInstanceId(), StoragePoolSearch.entity().getId(), JoinBuilder.JoinType.INNER);
StoragePoolSearch.done();
LocalStorageSearch = _storagePoolDao.createSearchBuilder();
SearchBuilder<StoragePoolHostVO> storageHostSearch = _storagePoolHostDao.createSearchBuilder();
storageHostSearch.and("hostId", storageHostSearch.entity().getHostId(), SearchCriteria.Op.EQ);
LocalStorageSearch.join("poolHost", storageHostSearch, storageHostSearch.entity().getPoolId(), LocalStorageSearch.entity().getId(), JoinBuilder.JoinType.INNER);
LocalStorageSearch.and("type", LocalStorageSearch.entity().getPoolType(), SearchCriteria.Op.IN);
LocalStorageSearch.done();
return true;
}
@ -2019,8 +2037,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
@Override
@DB
public StoragePoolVO preparePrimaryStorageForMaintenance(PreparePrimaryStorageForMaintenanceCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException {
Long primaryStorageId = cmd.getId();
public StoragePoolVO preparePrimaryStorageForMaintenance(Long primaryStorageId) throws ResourceUnavailableException, InsufficientCapacityException {
Long userId = UserContext.current().getCallerUserId();
User user = _userDao.findById(userId);
Account account = UserContext.current().getCaller();
@ -2090,6 +2107,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
}
}
// 4. Process the queue
List<StoragePoolWorkVO> pendingWork = _storagePoolWorkDao.listPendingWorkForPrepareForMaintenanceByPoolId(primaryStorageId);
@ -2985,8 +3003,10 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
long dcId = pool.getDataCenterId();
Long podId = pool.getPodId();
List<HostVO> secHosts = _hostDao.listSecondaryStorageHosts(dcId);
//FIXME, for cloudzone, the local secondary storoge
if (pool.isLocal() && pool.getPoolType() == StoragePoolType.Filesystem) {
if (pool.isLocal() && pool.getPoolType() == StoragePoolType.Filesystem && secHosts.isEmpty()) {
List<StoragePoolHostVO> sphs = _storagePoolHostDao.listByPoolId(pool.getId());
if (!sphs.isEmpty()) {
StoragePoolHostVO localStoragePoolHost = sphs.get(0);
@ -2996,7 +3016,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
}
}
List<HostVO> secHosts = _hostDao.listSecondaryStorageHosts(dcId);
if (secHosts.size() == 1) {
VMTemplateHostVO templateHostVO = _templateHostDao.findByHostTemplate(secHosts.get(0).getId(), templateId);
return templateHostVO;
@ -3016,4 +3035,27 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
return null;
}
@Override
@DB
public List<VMInstanceVO> listByStoragePool(long storagePoolId) {
SearchCriteria<VMInstanceVO> sc = StoragePoolSearch.create();
sc.setJoinParameters("vmVolume", "volumeType", Volume.Type.ROOT);
sc.setJoinParameters("vmVolume", "poolId", storagePoolId);
return _vmInstanceDao.search(sc, null);
}
@Override
@DB
public StoragePoolVO findLocalStorageOnHost(long hostId) {
SearchCriteria<StoragePoolVO> sc = LocalStorageSearch.create();
sc.setParameters("type", new Object[]{StoragePoolType.Filesystem, StoragePoolType.LVM});
sc.setJoinParameters("poolHost", "hostId", hostId);
List<StoragePoolVO> storagePools = _storagePoolDao.search(sc, null);
if (!storagePools.isEmpty()) {
return storagePools.get(0);
} else {
return null;
}
}
}

1
server/src/com/cloud/storage/dao/StoragePoolDao.java
View File

@ -106,4 +106,5 @@ public interface StoragePoolDao extends GenericDao<StoragePoolVO, Long> {
List<StoragePoolVO> findIfDuplicatePoolsExistByUUID(String uuid);
List<StoragePoolVO> listPoolsByStatus(StoragePoolStatus status);
}