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

bug 7119: code refactor away from the ms calls, to the share and prepare methods based on alex's recommendations 

status 7119: resolved fixed
This commit is contained in:
abhishek 2010-11-15 11:14:46 -08:00
parent b162e064c6
commit 6d943abf55
5 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/host/Status.java
View File

@ -30,6 +30,7 @@ public enum Status {
Updating(true, true, false),
PrepareForMaintenance(false, false, false),
ErrorInMaintenance(false, false, false),
CancelMaintenance(false, false, false),
Maintenance(false, false, false),
Alert(true, true, true),
Removed(true, false, true);

6
server/src/com/cloud/api/commands/StartSystemVMCmd.java
View File

@ -36,6 +36,7 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VMInstanceVO;
@Implementation(responseObject=SystemVmResponse.class, description="Starts a system virtual machine.")
@ -93,8 +94,9 @@ public class StartSystemVMCmd extends BaseAsyncCmd {
}
@Override
public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{
VMInstanceVO instance = BaseCmd._mgr.startSystemVM(this);
public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, CloudRuntimeException{
VMInstanceVO instance = _mgr.startSystemVM(this);
SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(instance);
response.setResponseName(getName());
this.setResponseObject(response);

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

@ -4819,29 +4819,9 @@ public class ManagementServerImpl implements ManagementServer {
if (systemVm.getType().equals(VirtualMachine.Type.ConsoleProxy)){
long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_PROXY_START, "Starting console proxy with Id: "+id);
// try {
// checkIfStoragePoolAvailable(id);
// } catch (StorageUnavailableException e) {
// s_logger.warn(e.getMessage());
// return null;
// } catch (Exception e){
// //unforseen exceptions
// s_logger.warn(e.getMessage());
// return null;
// }
return startConsoleProxy(id, eventId);
} else {
long eventId = EventUtils.saveScheduledEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventTypes.EVENT_SSVM_START, "Starting secondary storage Vm Id: "+id);
// try {
// checkIfStoragePoolAvailable(id);
// } catch (StorageUnavailableException e) {
// s_logger.warn(e.getMessage());
// return null;
// } catch (Exception e){
// //unforseen exceptions
// s_logger.warn(e.getMessage());
// return null;
// }
return startSecondaryStorageVm(id, eventId);
}
}
@ -4862,29 +4842,9 @@ public class ManagementServerImpl implements ManagementServer {
if (systemVm.getType() == VirtualMachine.Type.ConsoleProxy) {
long eventId = EventUtils.saveScheduledEvent(callerId, callerAccountId, EventTypes.EVENT_PROXY_START, "Starting console proxy with Id: "+id);
try {
checkIfStoragePoolAvailable(id);
} catch (StorageUnavailableException e) {
s_logger.warn(e.getMessage());
return null;
} catch (Exception e){
//unforseen exceptions
s_logger.warn(e.getMessage());
return null;
}
return startConsoleProxy(id, eventId);
} else if (systemVm.getType() == VirtualMachine.Type.SecondaryStorageVm) {
long eventId = EventUtils.saveScheduledEvent(callerId, callerAccountId, EventTypes.EVENT_SSVM_START, "Starting secondary storage Vm Id: "+id);
try {
checkIfStoragePoolAvailable(id);
} catch (StorageUnavailableException e) {
s_logger.warn(e.getMessage());
return null;
} catch (Exception e){
//unforseen exceptions
s_logger.warn(e.getMessage());
return null;
}
return startSecondaryStorageVm(id, eventId);
} else {
throw new InvalidParameterValueException("Unable to find a system vm: " + id);

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

@ -236,6 +236,15 @@ public class StorageManagerImpl implements StorageManager {
@Override
public boolean share(VMInstanceVO vm, List<VolumeVO> vols, HostVO host, boolean cancelPreviousShare) {
//if pool is in maintenance and it is the ONLY pool available; reject
List<VolumeVO> rootVolForGivenVm = _volsDao.findByInstanceAndType(vm.getId(), VolumeType.ROOT);
if(rootVolForGivenVm != null && rootVolForGivenVm.size() > 0){
boolean isPoolAvailable = isPoolAvailable(rootVolForGivenVm.get(0).getPoolId());
if(!isPoolAvailable){
return false;
}
}
//this check is done for maintenance mode for primary storage
//if any one of the volume is unusable, we return false
//if we return false, the allocator will try to switch to another PS if available
@ -299,6 +308,17 @@ public class StorageManagerImpl implements StorageManager {
return _volsDao.persist(newVol);
}
private boolean isPoolAvailable(Long poolId){
//get list of all pools
List<StoragePoolVO> pools = _storagePoolDao.listAll();
//if no pools or 1 pool which is in maintenance
if(pools == null || pools.size() == 0 || (pools.size() == 1 && pools.get(0).getStatus().equals(Status.Maintenance) )){
return false;
}else{
return true;
}
}
@Override
public List<VolumeVO> prepare(VMInstanceVO vm, HostVO host) {
@ -309,9 +329,19 @@ public class StorageManagerImpl implements StorageManager {
return vols;
}
//if pool is in maintenance and it is the ONLY pool available; reject
List<VolumeVO> rootVolForGivenVm = _volsDao.findByInstanceAndType(vm.getId(), VolumeType.ROOT);
if(rootVolForGivenVm != null && rootVolForGivenVm.size() > 0){
boolean isPoolAvailable = isPoolAvailable(rootVolForGivenVm.get(0).getPoolId());
if(!isPoolAvailable){
return new ArrayList<VolumeVO>();
}
}
//if we have a system vm
//get the storage pool
//if pool is in maintenance
//if pool is in prepareformaintenance
//add to recreate vols, and continue
if(vm.getType().equals(VirtualMachine.Type.ConsoleProxy) || vm.getType().equals(VirtualMachine.Type.DomainRouter) || vm.getType().equals(VirtualMachine.Type.SecondaryStorageVm))
{
@ -2380,6 +2410,10 @@ public class StorageManagerImpl implements StorageManager {
throw new StorageUnavailableException("Primary storage with id " + primaryStorageId + " is not ready to complete migration, as the status is:" + primaryStorage.getStatus().toString());
}
//set state to cancelmaintenance
primaryStorage.setStatus(Status.CancelMaintenance);
_storagePoolDao.persist(primaryStorage);
//2. Get a list of all the volumes within this storage pool
List<VolumeVO> allVolumes = _volsDao.findByPoolId(primaryStorageId);

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

@ -817,7 +817,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
return null;
}
// checkIfPoolAvailable(vmId);//throws StorageUnavailableException if pool is not UP
checkIfPoolAvailable(vmId);//throws StorageUnavailableException if pool is not UP
EventVO event = new EventVO();
event.setType(EventTypes.EVENT_VM_START);