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

cleanup snapshot code

Browse Source
This commit is contained in:
anthony 2010-12-02 14:48:22 -08:00
parent 87a5ee27ab
commit d184c56ef3
10 changed files with 152 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ public class ListSnapshotsCmd extends BaseListCmd {
@Override @Override
public void execute(){ public void execute(){
List<? extends Snapshot> result = _mgr.listSnapshots(this); List<? extends Snapshot> result = _snapshotMgr.listSnapshots(this);
ListResponse<SnapshotResponse> response = new ListResponse<SnapshotResponse>(); ListResponse<SnapshotResponse> response = new ListResponse<SnapshotResponse>();
List<SnapshotResponse> snapshotResponses = new ArrayList<SnapshotResponse>(); List<SnapshotResponse> snapshotResponses = new ArrayList<SnapshotResponse>();
for (Snapshot snapshot : result) { for (Snapshot snapshot : result) {

9
api/src/com/cloud/server/ManagementService.java
View File

@ -344,15 +344,6 @@ public interface ManagementService {
*/ */
List<? extends Capacity> listCapacities(ListCapacityCmd cmd); List<? extends Capacity> listCapacities(ListCapacityCmd cmd);
/**
* List all snapshots of a disk volume. Optionaly lists snapshots created by specified interval
* @param cmd the command containing the search criteria (order by, limit, etc.)
* @return list of snapshots
* @throws InvalidParameterValueException
* @throws PermissionDeniedException
*/
List<? extends Snapshot> listSnapshots(ListSnapshotsCmd cmd);
/** /**
* List the permissions on a template. This will return a list of account names that have been granted permission to launch instances from the template. * List the permissions on a template. This will return a list of account names that have been granted permission to launch instances from the template.
* @param cmd the command wrapping the search criteria (template id) * @param cmd the command wrapping the search criteria (template id)

11
api/src/com/cloud/storage/snapshot/SnapshotService.java
View File

@ -26,7 +26,9 @@ import com.cloud.api.commands.DeleteSnapshotCmd;
import com.cloud.api.commands.DeleteSnapshotPoliciesCmd; import com.cloud.api.commands.DeleteSnapshotPoliciesCmd;
import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd; import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd;
import com.cloud.api.commands.ListSnapshotPoliciesCmd; import com.cloud.api.commands.ListSnapshotPoliciesCmd;
import com.cloud.api.commands.ListSnapshotsCmd;
import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.Snapshot; import com.cloud.storage.Snapshot;
@ -46,6 +48,15 @@ public interface SnapshotService {
*/ */
Snapshot createSnapshotInternal(CreateSnapshotInternalCmd cmd) throws ResourceAllocationException; Snapshot createSnapshotInternal(CreateSnapshotInternalCmd cmd) throws ResourceAllocationException;
/**
* List all snapshots of a disk volume. Optionally lists snapshots created by specified interval
* @param cmd the command containing the search criteria (order by, limit, etc.)
* @return list of snapshots
* @throws InvalidParameterValueException
* @throws PermissionDeniedException
*/
List<? extends Snapshot> listSnapshots(ListSnapshotsCmd cmd);
/** /**
* Delete specified snapshot from the specified. * Delete specified snapshot from the specified.
* If no other policies are assigned it calls destroy snapshot. * If no other policies are assigned it calls destroy snapshot.

9
server/src/com/cloud/server/ManagementServer.java
View File

@ -503,13 +503,6 @@ public interface ManagementServer extends ManagementService {
public long getMemoryUsagebyHost(Long hostId); public long getMemoryUsagebyHost(Long hostId);
/**
* Destroy a snapshot
* @param snapshotId the id of the snapshot to destroy
* @return true if snapshot successfully destroyed, false otherwise
*/
boolean destroyTemplateSnapshot(Long userId, long snapshotId);
/** /**
* Finds a diskOffering by the specified ID. * Finds a diskOffering by the specified ID.
* @param diskOfferingId * @param diskOfferingId
@ -547,8 +540,6 @@ public interface ManagementServer extends ManagementService {
StoragePoolVO findPoolById(Long id); StoragePoolVO findPoolById(Long id);
List<? extends StoragePoolVO> searchForStoragePools(Criteria c); List<? extends StoragePoolVO> searchForStoragePools(Criteria c);
SnapshotPolicyVO findSnapshotPolicyById(Long policyId);
/** /**
* Return whether a domain is a child domain of a given domain. * Return whether a domain is a child domain of a given domain.
* @param parentId * @param parentId

167
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -107,7 +107,6 @@ import com.cloud.api.commands.ListPublicIpAddressesCmd;
import com.cloud.api.commands.ListRemoteAccessVpnsCmd; import com.cloud.api.commands.ListRemoteAccessVpnsCmd;
import com.cloud.api.commands.ListRoutersCmd; import com.cloud.api.commands.ListRoutersCmd;
import com.cloud.api.commands.ListServiceOfferingsCmd; import com.cloud.api.commands.ListServiceOfferingsCmd;
import com.cloud.api.commands.ListSnapshotsCmd;
import com.cloud.api.commands.ListStoragePoolsCmd; import com.cloud.api.commands.ListStoragePoolsCmd;
import com.cloud.api.commands.ListSystemVMsCmd; import com.cloud.api.commands.ListSystemVMsCmd;
import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd; import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd;
@ -218,10 +217,6 @@ import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.GuestOSCategoryVO; import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.GuestOSVO; import com.cloud.storage.GuestOSVO;
import com.cloud.storage.LaunchPermissionVO; import com.cloud.storage.LaunchPermissionVO;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Snapshot.Type;
import com.cloud.storage.SnapshotPolicyVO;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.Storage; import com.cloud.storage.Storage;
import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.Storage.TemplateType;
@ -234,15 +229,12 @@ import com.cloud.storage.Upload.Mode;
import com.cloud.storage.UploadVO; import com.cloud.storage.UploadVO;
import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Volume; import com.cloud.storage.Volume;
import com.cloud.storage.Volume.VolumeType;
import com.cloud.storage.VolumeStats; import com.cloud.storage.VolumeStats;
import com.cloud.storage.VolumeVO; import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.DiskOfferingDao;
import com.cloud.storage.dao.GuestOSCategoryDao; import com.cloud.storage.dao.GuestOSCategoryDao;
import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.dao.LaunchPermissionDao; import com.cloud.storage.dao.LaunchPermissionDao;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.SnapshotPolicyDao;
import com.cloud.storage.dao.StoragePoolDao; import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.storage.dao.StoragePoolHostDao;
import com.cloud.storage.dao.UploadDao; import com.cloud.storage.dao.UploadDao;
@ -346,8 +338,6 @@ public class ManagementServerImpl implements ManagementServer {
private final UserAccountDao _userAccountDao; private final UserAccountDao _userAccountDao;
private final AlertDao _alertDao; private final AlertDao _alertDao;
private final CapacityDao _capacityDao; private final CapacityDao _capacityDao;
private final SnapshotDao _snapshotDao;
private final SnapshotPolicyDao _snapshotPolicyDao;
private final GuestOSDao _guestOSDao; private final GuestOSDao _guestOSDao;
private final GuestOSCategoryDao _guestOSCategoryDao; private final GuestOSCategoryDao _guestOSCategoryDao;
private final StoragePoolDao _poolDao; private final StoragePoolDao _poolDao;
@ -443,8 +433,6 @@ public class ManagementServerImpl implements ManagementServer {
_userAccountDao = locator.getDao(UserAccountDao.class); _userAccountDao = locator.getDao(UserAccountDao.class);
_alertDao = locator.getDao(AlertDao.class); _alertDao = locator.getDao(AlertDao.class);
_capacityDao = locator.getDao(CapacityDao.class); _capacityDao = locator.getDao(CapacityDao.class);
_snapshotDao = locator.getDao(SnapshotDao.class);
_snapshotPolicyDao = locator.getDao(SnapshotPolicyDao.class);
_guestOSDao = locator.getDao(GuestOSDao.class); _guestOSDao = locator.getDao(GuestOSDao.class);
_guestOSCategoryDao = locator.getDao(GuestOSCategoryDao.class); _guestOSCategoryDao = locator.getDao(GuestOSCategoryDao.class);
_poolDao = locator.getDao(StoragePoolDao.class); _poolDao = locator.getDao(StoragePoolDao.class);
@ -4121,117 +4109,6 @@ public class ManagementServerImpl implements ManagementServer {
return mem; return mem;
} }
@Override
public boolean destroyTemplateSnapshot(Long userId, long snapshotId) {
return _vmMgr.destroyTemplateSnapshot(userId, snapshotId);
}
@Override
public List<SnapshotVO> listSnapshots(ListSnapshotsCmd cmd) throws InvalidParameterValueException, PermissionDeniedException {
Long volumeId = cmd.getVolumeId();
// Verify parameters
if(volumeId != null){
VolumeVO volume = _volumeDao.findById(volumeId);
if (volume == null) {
throw new InvalidParameterValueException("unable to find a volume with id " + volumeId);
}
checkAccountPermissions(volume.getAccountId(), volume.getDomainId(), "volume", volumeId);
}
Account account = UserContext.current().getAccount();
Long domainId = cmd.getDomainId();
String accountName = cmd.getAccountName();
Long accountId = null;
if ((account == null) || isAdmin(account.getType())) {
if (domainId != null) {
if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), domainId)) {
throw new PermissionDeniedException("Unable to list templates for domain " + domainId + ", permission denied.");
}
} else if ((account != null) && (account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN)) {
domainId = account.getDomainId();
}
if (domainId != null && accountName != null) {
Account userAccount = _accountDao.findActiveAccount(accountName, domainId);
if (userAccount != null) {
accountId = userAccount.getId();
}
}
} else {
accountId = account.getId();
}
Object name = cmd.getSnapshotName();
Object id = cmd.getId();
Object keyword = cmd.getKeyword();
Object snapshotTypeStr = cmd.getSnapshotType();
Filter searchFilter = new Filter(SnapshotVO.class, "created", false, cmd.getStartIndex(), cmd.getPageSizeVal());
SearchBuilder<SnapshotVO> sb = _snapshotDao.createSearchBuilder();
sb.and("status", sb.entity().getStatus(), SearchCriteria.Op.EQ);
sb.and("volumeId", sb.entity().getVolumeId(), SearchCriteria.Op.EQ);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ);
sb.and("snapshotTypeEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.EQ);
sb.and("snapshotTypeNEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.NEQ);
if ((accountId == null) && (domainId != null)) {
// if accountId isn't specified, we can do a domain match for the admin case
SearchBuilder<AccountVO> accountSearch = _accountDao.createSearchBuilder();
sb.join("accountSearch", accountSearch, sb.entity().getAccountId(), accountSearch.entity().getId(), JoinType.INNER);
SearchBuilder<DomainVO> domainSearch = _domainDao.createSearchBuilder();
domainSearch.and("path", domainSearch.entity().getPath(), SearchCriteria.Op.LIKE);
accountSearch.join("domainSearch", domainSearch, accountSearch.entity().getDomainId(), domainSearch.entity().getId(), JoinType.INNER);
}
SearchCriteria<SnapshotVO> sc = sb.create();
sc.setParameters("status", Snapshot.Status.BackedUp);
if (volumeId != null) {
sc.setParameters("volumeId", volumeId);
}
if (name != null) {
sc.setParameters("name", "%" + name + "%");
}
if (id != null) {
sc.setParameters("id", id);
}
if (keyword != null) {
SearchCriteria<SnapshotVO> ssc = _snapshotDao.createSearchCriteria();
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
sc.addAnd("name", SearchCriteria.Op.SC, ssc);
}
if (accountId != null) {
sc.setParameters("accountId", accountId);
} else if (domainId != null) {
DomainVO domain = _domainDao.findById(domainId);
SearchCriteria<?> joinSearch = sc.getJoin("accountSearch");
joinSearch.setJoinParameters("domainSearch", "path", domain.getPath() + "%");
}
if (snapshotTypeStr != null) {
Type snapshotType = SnapshotVO.getSnapshotType((String)snapshotTypeStr);
if (snapshotType == null) {
throw new InvalidParameterValueException("Unsupported snapshot type " + snapshotTypeStr);
}
sc.setParameters("snapshotTypeEQ", snapshotType.ordinal());
} else {
// Show only MANUAL and RECURRING snapshot types
sc.setParameters("snapshotTypeNEQ", Snapshot.Type.TEMPLATE.ordinal());
}
return _snapshotDao.search(sc, searchFilter);
}
@Override @Override
public DiskOfferingVO findDiskOfferingById(long diskOfferingId) { public DiskOfferingVO findDiskOfferingById(long diskOfferingId) {
return _diskOfferingDao.findById(diskOfferingId); return _diskOfferingDao.findById(diskOfferingId);
@ -5082,11 +4959,6 @@ public class ManagementServerImpl implements ManagementServer {
return _jobDao.search(sc, searchFilter); return _jobDao.search(sc, searchFilter);
} }
@Override
public SnapshotPolicyVO findSnapshotPolicyById(Long policyId) {
return _snapshotPolicyDao.findById(policyId);
}
@Override @Override
public boolean isChildDomain(Long parentId, Long childId) { public boolean isChildDomain(Long parentId, Long childId) {
return _domainDao.isChildDomain(parentId, childId); return _domainDao.isChildDomain(parentId, childId);
@ -5262,25 +5134,6 @@ public class ManagementServerImpl implements ManagementServer {
} }
} }
private void checkIfStoragePoolAvailable(Long id) throws StorageUnavailableException {
//check if the sp is up before starting
List<VolumeVO> rootVolList = _volumeDao.findByInstanceAndType(id, VolumeType.ROOT);
if(rootVolList == null || rootVolList.size() == 0){
throw new StorageUnavailableException("Could not find the root disk for this vm to verify if the pool on which it exists is Up or not");
}else{
Long poolId = rootVolList.get(0).getPoolId();//each vm has 1 root vol
StoragePoolVO sp = _poolDao.findById(poolId);
if(sp == null){
throw new StorageUnavailableException("Could not find the pool for the root disk of vm"+id+", to confirm if it is Up or not");
}else{
//found pool
if(!sp.getStatus().equals(com.cloud.host.Status.Up)){
throw new StorageUnavailableException("Could not start the vm; the associated storage pool is in:"+sp.getStatus().toString()+" state");
}
}
}
}
@Override @Override
public VMInstanceVO stopSystemVM(StopSystemVmCmd cmd) { public VMInstanceVO stopSystemVM(StopSystemVmCmd cmd) {
Long id = cmd.getId(); Long id = cmd.getId();
@ -5963,25 +5816,7 @@ public class ManagementServerImpl implements ManagementServer {
return hypers.split(","); return hypers.split(",");
} }
private Long checkAccountPermissions(long targetAccountId, long targetDomainId, String targetDesc, long targetId) throws ServerApiException { @Override
Long accountId = null;
Account account = UserContext.current().getAccount();
if (account != null) {
if (!isAdmin(account.getType())) {
if (account.getId() != targetAccountId) {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Unable to find a " + targetDesc + " with id " + targetId + " for this account");
}
} else if (!_domainDao.isChildDomain(account.getDomainId(), targetDomainId)) {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Unable to perform operation for " + targetDesc + " with id " + targetId + ", permission denied.");
}
accountId = account.getId();
}
return accountId;
}
@Override
public List<RemoteAccessVpnVO> searchForRemoteAccessVpns(ListRemoteAccessVpnsCmd cmd) throws InvalidParameterValueException, public List<RemoteAccessVpnVO> searchForRemoteAccessVpns(ListRemoteAccessVpnsCmd cmd) throws InvalidParameterValueException,
PermissionDeniedException { PermissionDeniedException {
// do some parameter validation // do some parameter validation

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

@ -50,7 +50,6 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
return listByVolumeIdType(null, volumeId, type); return listByVolumeIdType(null, volumeId, type);
} }
@Override @Override
public List<SnapshotVO> listByVolumeId(long volumeId) { public List<SnapshotVO> listByVolumeId(long volumeId) {
return listByVolumeId(null, volumeId); return listByVolumeId(null, volumeId);

3
server/src/com/cloud/storage/snapshot/SnapshotManager.java
View File

@ -19,6 +19,9 @@ package com.cloud.storage.snapshot;
import java.util.List; import java.util.List;
import com.cloud.api.commands.ListSnapshotsCmd;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.SnapshotPolicyVO; import com.cloud.storage.SnapshotPolicyVO;
import com.cloud.storage.SnapshotVO; import com.cloud.storage.SnapshotVO;

155
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View File

@ -47,11 +47,13 @@ import com.cloud.api.commands.DeleteSnapshotCmd;
import com.cloud.api.commands.DeleteSnapshotPoliciesCmd; import com.cloud.api.commands.DeleteSnapshotPoliciesCmd;
import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd; import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd;
import com.cloud.api.commands.ListSnapshotPoliciesCmd; import com.cloud.api.commands.ListSnapshotPoliciesCmd;
import com.cloud.api.commands.ListSnapshotsCmd;
import com.cloud.async.AsyncInstanceCreateStatus; import com.cloud.async.AsyncInstanceCreateStatus;
import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobManager;
import com.cloud.configuration.ResourceCount.ResourceType; import com.cloud.configuration.ResourceCount.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterDao;
import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao; import com.cloud.domain.dao.DomainDao;
import com.cloud.event.EventTypes; import com.cloud.event.EventTypes;
import com.cloud.event.EventUtils; import com.cloud.event.EventUtils;
@ -84,6 +86,7 @@ import com.cloud.storage.dao.VMTemplatePoolDao;
import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.dao.VolumeDao;
import com.cloud.user.Account; import com.cloud.user.Account;
import com.cloud.user.AccountManager; import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
import com.cloud.user.User; import com.cloud.user.User;
import com.cloud.user.UserContext; import com.cloud.user.UserContext;
import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.AccountDao;
@ -95,8 +98,11 @@ import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.component.Inject; import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager; import com.cloud.utils.component.Manager;
import com.cloud.utils.db.DB; import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction; import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.JoinBuilder.JoinType;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDao;
@ -143,7 +149,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
if (volume.getInstanceId() == null) { if (volume.getInstanceId() == null) {
long lastSnapId = _snapshotDao.getLastSnapshot(volumeId, 0); long lastSnapId = _snapshotDao.getLastSnapshot(volumeId, 0);
SnapshotVO lastSnap = _snapshotDao.findById(lastSnapId); SnapshotVO lastSnap = _snapshotDao.findByIdIncludingRemoved(lastSnapId);
if (lastSnap != null) { if (lastSnap != null) {
Date lastSnapTime = lastSnap.getCreated(); Date lastSnapTime = lastSnap.getCreated();
if (lastSnapTime.after(volume.getUpdated())){ if (lastSnapTime.after(volume.getUpdated())){
@ -154,7 +160,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
} else if (_storageMgr.volumeInactive(volume)) { } else if (_storageMgr.volumeInactive(volume)) {
// Volume is attached to a VM which is in Stopped state. // Volume is attached to a VM which is in Stopped state.
long lastSnapId = _snapshotDao.getLastSnapshot(volumeId, 0); long lastSnapId = _snapshotDao.getLastSnapshot(volumeId, 0);
SnapshotVO lastSnap = _snapshotDao.findById(lastSnapId); SnapshotVO lastSnap = _snapshotDao.findByIdIncludingRemoved(lastSnapId);
if (lastSnap != null) { if (lastSnap != null) {
Date lastSnapTime = lastSnap.getCreated(); Date lastSnapTime = lastSnap.getCreated();
VMInstanceVO vmInstance = _vmDao.findById(volume.getInstanceId()); VMInstanceVO vmInstance = _vmDao.findById(volume.getInstanceId());
@ -236,7 +242,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
SnapshotVO preSnapshotVO = null; SnapshotVO preSnapshotVO = null;
if( preId != 0) { if( preId != 0) {
preSnapshotVO = _snapshotDao.findById(preId); preSnapshotVO = _snapshotDao.findByIdIncludingRemoved(preId);
if (preSnapshotVO != null) { if (preSnapshotVO != null) {
preSnapshotPath = preSnapshotVO.getPath(); preSnapshotPath = preSnapshotVO.getPath();
} }
@ -252,7 +258,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
if( preSnapshotPath != null && preSnapshotPath == answer.getSnapshotPath() ){ if( preSnapshotPath != null && preSnapshotPath == answer.getSnapshotPath() ){
//empty snapshot //empty snapshot
s_logger.debug("CreateSnapshot: this is empty snapshot, remove it "); s_logger.debug("CreateSnapshot: this is empty snapshot, remove it ");
createdSnapshot = _snapshotDao.findById(id); createdSnapshot = _snapshotDao.findByIdIncludingRemoved(id);
// delete from the snapshots table // delete from the snapshots table
_snapshotDao.expunge(id); _snapshotDao.expunge(id);
throw new CloudRuntimeException("There is no change for volume " + volumeId + " since last snapshot, please use last snapshot instead."); throw new CloudRuntimeException("There is no change for volume " + volumeId + " since last snapshot, please use last snapshot instead.");
@ -276,7 +282,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
if (preSSId == 0) { if (preSSId == 0) {
break; break;
} }
preSnapshotVO = _snapshotDao.findById(preSSId); preSnapshotVO = _snapshotDao.findByIdIncludingRemoved(preSSId);
} }
if (i >= deltaSnap) { if (i >= deltaSnap) {
preSnapshotId = 0; preSnapshotId = 0;
@ -298,7 +304,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
s_logger.error(answer.getDetails()); s_logger.error(answer.getDetails());
} }
// The snapshot was not successfully created // The snapshot was not successfully created
createdSnapshot = _snapshotDao.findById(id); createdSnapshot = _snapshotDao.findByIdIncludingRemoved(id);
// delete from the snapshots table // delete from the snapshots table
_snapshotDao.expunge(id); _snapshotDao.expunge(id);
throw new CloudRuntimeException("Creating snapshot for volume " + volumeId + " on primary storage failed."); throw new CloudRuntimeException("Creating snapshot for volume " + volumeId + " on primary storage failed.");
@ -365,7 +371,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
} }
private SnapshotVO updateDBOnCreate(Long id, String snapshotPath, long preSnapshotId) { private SnapshotVO updateDBOnCreate(Long id, String snapshotPath, long preSnapshotId) {
SnapshotVO createdSnapshot = _snapshotDao.findById(id); SnapshotVO createdSnapshot = _snapshotDao.findByIdIncludingRemoved(id);
createdSnapshot.setPath(snapshotPath); createdSnapshot.setPath(snapshotPath);
createdSnapshot.setStatus(Snapshot.Status.CreatedOnPrimary); createdSnapshot.setStatus(Snapshot.Status.CreatedOnPrimary);
createdSnapshot.setPrevSnapshotId(preSnapshotId); createdSnapshot.setPrevSnapshotId(preSnapshotId);
@ -433,7 +439,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
long prevSnapshotId = snapshot.getPrevSnapshotId(); long prevSnapshotId = snapshot.getPrevSnapshotId();
if (prevSnapshotId > 0) { if (prevSnapshotId > 0) {
prevSnapshot = _snapshotDao.findById(prevSnapshotId); prevSnapshot = _snapshotDao.findByIdIncludingRemoved(prevSnapshotId);
prevSnapshotUuid = prevSnapshot.getPath(); prevSnapshotUuid = prevSnapshot.getPath();
prevBackupUuid = prevSnapshot.getBackupSnapshotId(); prevBackupUuid = prevSnapshot.getBackupSnapshotId();
} }
@ -539,7 +545,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
// This is a manual create, so increment the count of snapshots for // This is a manual create, so increment the count of snapshots for
// this account // this account
if (policyId == Snapshot.MANUAL_POLICY_ID) { if (policyId == Snapshot.MANUAL_POLICY_ID) {
Snapshot snapshot = _snapshotDao.findById(snapshotId); Snapshot snapshot = _snapshotDao.findByIdIncludingRemoved(snapshotId);
_accountMgr.incrementResourceCount(snapshot.getAccountId(), ResourceType.snapshot); _accountMgr.incrementResourceCount(snapshot.getAccountId(), ResourceType.snapshot);
} }
} }
@ -601,7 +607,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
Long snapshotId = cmd.getId(); Long snapshotId = cmd.getId();
//Verify parameters //Verify parameters
Snapshot snapshotCheck = _snapshotDao.findById(snapshotId.longValue()); Snapshot snapshotCheck = _snapshotDao.findByIdIncludingRemoved(snapshotId.longValue());
if (snapshotCheck == null) { if (snapshotCheck == null) {
throw new ServerApiException (BaseCmd.PARAM_ERROR, "unable to find a snapshot with id " + snapshotId); throw new ServerApiException (BaseCmd.PARAM_ERROR, "unable to find a snapshot with id " + snapshotId);
} }
@ -641,20 +647,19 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("Calling deleteSnapshot for snapshotId: " + snapshotId + " and policyId " + policyId); s_logger.debug("Calling deleteSnapshot for snapshotId: " + snapshotId + " and policyId " + policyId);
} }
SnapshotVO lastSnapshot = null; SnapshotVO lastSnapshot = null;
_snapshotDao.remove(snapshotId); _snapshotDao.remove(snapshotId);
long lastId = snapshotId; long lastId = snapshotId;
boolean destroy = false; boolean destroy = false;
while( true ) { while( true ) {
lastSnapshot = _snapshotDao.findNextSnapshot(lastId); lastSnapshot = _snapshotDao.findNextSnapshot(lastId);
// prevsnapshotId equal 0, means it is a full snapshot
if( lastSnapshot == null ) { if( lastSnapshot == null ) {
break; // if all snapshots after this snapshot in this chain are removed, remove those snapshots.
destroy = true;
break;
} }
if( lastSnapshot.getPrevSnapshotId() == 0) { if( lastSnapshot.getRemoved() == null ) {
// have another full snapshot, then we may delete previous delta snapshots // if there is one child not removed, then can not remove back up snapshot.
destroy = true;
break; break;
} }
lastId = lastSnapshot.getId(); lastId = lastSnapshot.getId();
@ -676,7 +681,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
if (lastId == 0) { if (lastId == 0) {
break; break;
} }
lastSnapshot = _snapshotDao.findById(lastId); lastSnapshot = _snapshotDao.findByIdIncludingRemoved(lastId);
} }
} }
return true; return true;
@ -693,7 +698,10 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
String details = null; String details = null;
SnapshotVO snapshot = _snapshotDao.findByIdIncludingRemoved(snapshotId); SnapshotVO snapshot = _snapshotDao.findByIdIncludingRemoved(snapshotId);
VolumeVO volume = _volsDao.findById(snapshot.getVolumeId()); VolumeVO volume = _volsDao.findByIdIncludingRemoved(snapshot.getVolumeId());
if ( volume == null ) {
throw new CloudRuntimeException("Destroying snapshot " + snapshotId + " backup failed due to unable to find volume " + snapshot.getVolumeId());
}
String primaryStoragePoolNameLabel = _storageMgr.getPrimaryStorageNameLabel(volume); String primaryStoragePoolNameLabel = _storageMgr.getPrimaryStorageNameLabel(volume);
String secondaryStoragePoolUrl = _storageMgr.getSecondaryStorageURL(volume.getDataCenterId()); String secondaryStoragePoolUrl = _storageMgr.getSecondaryStorageURL(volume.getDataCenterId());
Long dcId = volume.getDataCenterId(); Long dcId = volume.getDataCenterId();
@ -747,7 +755,6 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
txn.start(); txn.start();
SnapshotVO snapshot = _snapshotDao.findByIdIncludingRemoved(snapshotId); SnapshotVO snapshot = _snapshotDao.findByIdIncludingRemoved(snapshotId);
_snapshotDao.expunge(snapshotId);
// If this is a manual delete, decrement the count of snapshots for this account // If this is a manual delete, decrement the count of snapshots for this account
if (policyId == Snapshot.MANUAL_POLICY_ID) { if (policyId == Snapshot.MANUAL_POLICY_ID) {
_accountMgr.decrementResourceCount(snapshot.getAccountId(), ResourceType.snapshot); _accountMgr.decrementResourceCount(snapshot.getAccountId(), ResourceType.snapshot);
@ -756,6 +763,114 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
txn.commit(); txn.commit();
} }
@Override
public List<SnapshotVO> listSnapshots(ListSnapshotsCmd cmd) throws InvalidParameterValueException, PermissionDeniedException {
Long volumeId = cmd.getVolumeId();
// Verify parameters
if(volumeId != null){
VolumeVO volume = _volsDao.findById(volumeId);
if (volume == null) {
throw new InvalidParameterValueException("unable to find a volume with id " + volumeId);
}
checkAccountPermissions(volume.getAccountId(), volume.getDomainId(), "volume", volumeId);
}
Account account = UserContext.current().getAccount();
Long domainId = cmd.getDomainId();
String accountName = cmd.getAccountName();
Long accountId = null;
if ((account == null) || isAdmin(account.getType())) {
if (domainId != null) {
if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), domainId)) {
throw new PermissionDeniedException("Unable to list templates for domain " + domainId + ", permission denied.");
}
} else if ((account != null) && (account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN)) {
domainId = account.getDomainId();
}
if (domainId != null && accountName != null) {
Account userAccount = _accountDao.findActiveAccount(accountName, domainId);
if (userAccount != null) {
accountId = userAccount.getId();
}
}
} else {
accountId = account.getId();
}
Object name = cmd.getSnapshotName();
Object id = cmd.getId();
Object keyword = cmd.getKeyword();
Object snapshotTypeStr = cmd.getSnapshotType();
Filter searchFilter = new Filter(SnapshotVO.class, "created", false, cmd.getStartIndex(), cmd.getPageSizeVal());
SearchBuilder<SnapshotVO> sb = _snapshotDao.createSearchBuilder();
sb.and("status", sb.entity().getStatus(), SearchCriteria.Op.EQ);
sb.and("volumeId", sb.entity().getVolumeId(), SearchCriteria.Op.EQ);
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ);
sb.and("snapshotTypeEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.EQ);
sb.and("snapshotTypeNEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.NEQ);
if ((accountId == null) && (domainId != null)) {
// if accountId isn't specified, we can do a domain match for the admin case
SearchBuilder<AccountVO> accountSearch = _accountDao.createSearchBuilder();
sb.join("accountSearch", accountSearch, sb.entity().getAccountId(), accountSearch.entity().getId(), JoinType.INNER);
SearchBuilder<DomainVO> domainSearch = _domainDao.createSearchBuilder();
domainSearch.and("path", domainSearch.entity().getPath(), SearchCriteria.Op.LIKE);
accountSearch.join("domainSearch", domainSearch, accountSearch.entity().getDomainId(), domainSearch.entity().getId(), JoinType.INNER);
}
SearchCriteria<SnapshotVO> sc = sb.create();
sc.setParameters("status", Snapshot.Status.BackedUp);
if (volumeId != null) {
sc.setParameters("volumeId", volumeId);
}
if (name != null) {
sc.setParameters("name", "%" + name + "%");
}
if (id != null) {
sc.setParameters("id", id);
}
if (keyword != null) {
SearchCriteria<SnapshotVO> ssc = _snapshotDao.createSearchCriteria();
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
sc.addAnd("name", SearchCriteria.Op.SC, ssc);
}
if (accountId != null) {
sc.setParameters("accountId", accountId);
} else if (domainId != null) {
DomainVO domain = _domainDao.findById(domainId);
SearchCriteria<?> joinSearch = sc.getJoin("accountSearch");
joinSearch.setJoinParameters("domainSearch", "path", domain.getPath() + "%");
}
if (snapshotTypeStr != null) {
Type snapshotType = SnapshotVO.getSnapshotType((String)snapshotTypeStr);
if (snapshotType == null) {
throw new InvalidParameterValueException("Unsupported snapshot type " + snapshotTypeStr);
}
sc.setParameters("snapshotTypeEQ", snapshotType.ordinal());
} else {
// Show only MANUAL and RECURRING snapshot types
sc.setParameters("snapshotTypeNEQ", Snapshot.Type.TEMPLATE.ordinal());
}
return _snapshotDao.search(sc, searchFilter);
}
@Override @Override
public boolean deleteSnapshotDirsForAccount(long accountId) { public boolean deleteSnapshotDirsForAccount(long accountId) {
@ -777,7 +892,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
// This volume doesn't have any snapshots. Nothing do delete. // This volume doesn't have any snapshots. Nothing do delete.
continue; continue;
} }
SnapshotVO mostRecentSnapshot = _snapshotDao.findById(mostRecentSnapshotId); SnapshotVO mostRecentSnapshot = _snapshotDao.findByIdIncludingRemoved(mostRecentSnapshotId);
if (mostRecentSnapshot == null) { if (mostRecentSnapshot == null) {
// Huh. The code should never reach here. // Huh. The code should never reach here.
s_logger.error("Volume Id's mostRecentSnapshot with id: " + mostRecentSnapshotId + " turns out to be null"); s_logger.error("Volume Id's mostRecentSnapshot with id: " + mostRecentSnapshotId + " turns out to be null");

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

@ -133,8 +133,6 @@ public interface UserVmManager extends VirtualMachineManager<UserVmVO> {
*/ */
HashMap<Long, VmStatsEntry> getVirtualMachineStatistics(long hostId, String hostName, List<Long> vmIds); HashMap<Long, VmStatsEntry> getVirtualMachineStatistics(long hostId, String hostName, List<Long> vmIds);
boolean destroyTemplateSnapshot(Long userId, long snapshotId);
/** /**
* Clean the network rules for the given VM * Clean the network rules for the given VM
* @param userId * @param userId

28
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -51,7 +51,6 @@ import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand;
import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand; import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand;
import com.cloud.agent.api.GetVmStatsAnswer; import com.cloud.agent.api.GetVmStatsAnswer;
import com.cloud.agent.api.GetVmStatsCommand; import com.cloud.agent.api.GetVmStatsCommand;
import com.cloud.agent.api.ManageSnapshotCommand;
import com.cloud.agent.api.MigrateCommand; import com.cloud.agent.api.MigrateCommand;
import com.cloud.agent.api.PrepareForMigrationCommand; import com.cloud.agent.api.PrepareForMigrationCommand;
import com.cloud.agent.api.RebootAnswer; import com.cloud.agent.api.RebootAnswer;
@ -2318,33 +2317,6 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
} }
} }
@Override
public boolean destroyTemplateSnapshot(Long userId, long snapshotId) {
boolean success = false;
SnapshotVO snapshot = _snapshotDao.findById(Long.valueOf(snapshotId));
if (snapshot != null) {
VolumeVO volume = _volsDao.findById(snapshot.getVolumeId());
ManageSnapshotCommand cmd = new ManageSnapshotCommand(snapshotId, snapshot.getPath());
Answer answer = null;
String basicErrMsg = "Failed to destroy template snapshot: " + snapshot.getName();
Long storagePoolId = volume.getPoolId();
answer = _storageMgr.sendToHostsOnStoragePool(storagePoolId, cmd, basicErrMsg);
if ((answer != null) && answer.getResult()) {
// delete the snapshot from the database
_snapshotDao.expunge(snapshotId);
success = true;
}
if (answer != null) {
s_logger.error(answer.getDetails());
}
}
return success;
}
@Override @Override
public void cleanNetworkRules(long userId, long instanceId) { public void cleanNetworkRules(long userId, long instanceId) {
UserVmVO vm = _vmDao.findById(instanceId); UserVmVO vm = _vmDao.findById(instanceId);