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

the pool availability part is done by the sp allocators, hence commenting out the code in here.

This commit is contained in:
abhishek 2010-11-12 17:19:15 -08:00
parent cac54e1b99
commit 7327906cdf
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4808,29 +4808,29 @@ 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;
}
// 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;
}
// 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);
}
}

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);