apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8045: fixing the corner case around uncaught/unexpected exceptions; minor refactor of the code

Browse Source 
status 8045: resolved fixed
This commit is contained in:
abhishek 2011-01-19 15:03:25 -08:00
parent c525a41ef7
commit 210e828a46
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,7 @@ import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceInUseException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.exception.StorageUnavailableException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
@ -2124,8 +2125,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
{
String errorMsg = "There was an error stopping the console proxy id: "+vmInstance.getId()+" ,cannot enable storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
else if(restart)
@ -2137,8 +2137,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
{
String errorMsg = "There was an error starting the console proxy id: "+vmInstance.getId()+" on another storage pool, cannot enable primary storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
}
@ -2152,8 +2151,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
{
String errorMsg = "There was an error stopping the user vm id: "+vmInstance.getId()+" ,cannot enable storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
}
@ -2165,18 +2163,16 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
{
String errorMsg = "There was an error stopping the ssvm id: "+vmInstance.getId()+" ,cannot enable storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
else if(restart)
{
if(_secStorageMgr.startSecStorageVm(vmInstance.getId())==null)
if(_secStorageMgr.startSecStorageVm(vmInstance.getId()) == null)
{
String errorMsg = "There was an error starting the ssvm id: "+vmInstance.getId()+" on another storage pool, cannot enable primary storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
}
@ -2189,8 +2185,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
{
String errorMsg = "There was an error stopping the domain router id: "+vmInstance.getId()+" ,cannot enable primary storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
else if(restart)
@ -2199,8 +2194,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
{
String errorMsg = "There was an error starting the domain router id: "+vmInstance.getId()+" on another storage pool, cannot enable primary storage maintenance";
s_logger.warn(errorMsg);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new CloudRuntimeException(errorMsg);
}
}
@ -2214,16 +2208,24 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
return _storagePoolDao.findById(primaryStorageId);
} catch (Exception e) {
if(e instanceof ExecutionException){
if(e instanceof ExecutionException || e instanceof ResourceUnavailableException){
s_logger.error("Exception in enabling primary storage maintenance:",e);
setPoolStateToError(primaryStorage);
throw new ServerApiException(BaseCmd.RESOURCE_UNAVAILABLE_ERROR, e.getMessage());
}
if(e instanceof InvalidParameterValueException){
s_logger.error("Exception in enabling primary storage maintenance:",e);
setPoolStateToError(primaryStorage);
throw new ServerApiException(BaseCmd.PARAM_ERROR, e.getMessage());
}
if(e instanceof InsufficientCapacityException){
s_logger.error("Exception in enabling primary storage maintenance:",e);
setPoolStateToError(primaryStorage);
throw new ServerApiException(BaseCmd.INSUFFICIENT_CAPACITY_ERROR, e.getMessage());
}
//for everything else
s_logger.error("Exception in enabling primary storage maintenance:",e);
setPoolStateToError(primaryStorage);
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, e.getMessage());
}finally{
@ -2231,6 +2233,11 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
}
}
private void setPoolStateToError(StoragePoolVO primaryStorage) {
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
}
private Long saveScheduledEvent(Long userId, Long accountId, String type, String description)
{
EventVO event = new EventVO();
@ -2326,8 +2333,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
} catch (ConcurrentOperationException e) {
String msg = "There was an error starting the user vm id: "+vmInstance.getId()+" on storage pool, cannot complete primary storage maintenance";
s_logger.warn(msg,e);
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
throw new ExecutionException(msg);
} catch (ExecutionException e) {
String msg = "There was an error starting the user vm id: "+vmInstance.getId()+" on storage pool, cannot complete primary storage maintenance";
@ -2358,8 +2364,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
return primaryStorage;
} catch (Exception e) {
primaryStorage.setStatus(Status.ErrorInMaintenance);
_storagePoolDao.persist(primaryStorage);
setPoolStateToError(primaryStorage);
if(e instanceof ExecutionException){
throw new ServerApiException(BaseCmd.RESOURCE_UNAVAILABLE_ERROR, e.getMessage());
}

7
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
View File

@ -233,8 +233,13 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
s_logger.warn("Exception while trying to start secondary storage vm", e);
return null;
} catch (ResourceUnavailableException e) {
s_logger.warn("Exception while trying to start secondary storage vm", e);
return null;
} finally {
} catch (Exception e) {
s_logger.warn("Exception while trying to start secondary storage vm", e);
return null;
}
finally {
if (started) {
EventUtils.saveEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM, EventVO.LEVEL_INFO, EventTypes.EVENT_SSVM_START,
"Started secondary storage Vm with Id: " + secStorageVmId, startEventId);