readibilty of log- and exception messages Signed-off-by: Prasanna Santhanam <t...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/639592f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/639592f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/639592f3 Branch: refs/heads/vmsync Commit: 639592f3b7ef1baede230110cb1e1b6bf30d8b1e Parents: ffd5f1a Author: Daan Hoogland <dhoogl...@schubergphilis.com> Authored: Mon Jul 1 12:41:41 2013 +0200 Committer: Prasanna Santhanam <t...@apache.org> Committed: Mon Jul 1 20:17:11 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/storage/StorageManagerImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/639592f3/server/src/com/cloud/storage/StorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 138c6d7..b64b202 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -658,7 +658,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C try { scopeType = Enum.valueOf(ScopeType.class, scope.toUpperCase()); } catch (Exception e) { - throw new InvalidParameterValueException("invalid scope" + scope); + throw new InvalidParameterValueException("invalid scope for pool " + scope); } } @@ -678,7 +678,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C try { hypervisorType = HypervisorType.getType(hypervisor); } catch (Exception e) { - throw new InvalidParameterValueException("invalid hypervisor type" + hypervisor); + throw new InvalidParameterValueException("invalid hypervisor type " + hypervisor); } } else { throw new InvalidParameterValueException( @@ -812,9 +812,9 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C try { future.get(); } catch (InterruptedException e) { - s_logger.debug("expunge volume failed" + vol.getId(), e); + s_logger.debug("expunge volume failed:" + vol.getId(), e); } catch (ExecutionException e) { - s_logger.debug("expunge volume failed" + vol.getId(), e); + s_logger.debug("expunge volume failed:" + vol.getId(), e); } } } @@ -822,7 +822,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C // Check if the pool has associated volumes in the volumes table // If it does , then you cannot delete the pool if (vlms.first() > 0) { - throw new CloudRuntimeException("Cannot delete pool " + sPool.getName() + " as there are associated vols" + " for this pool"); + throw new CloudRuntimeException("Cannot delete pool " + sPool.getName() + " as there are associated volumes for this pool"); } } @@ -1277,7 +1277,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C public void onManagementNodeLeft(List<ManagementServerHostVO> nodeList, long selfNodeId) { for (ManagementServerHostVO vo : nodeList) { if (vo.getMsid() == _serverId) { - s_logger.info("Cleaning up storage maintenance jobs associated with Management server" + vo.getMsid()); + s_logger.info("Cleaning up storage maintenance jobs associated with Management server: " + vo.getMsid()); List<Long> poolIds = _storagePoolWorkDao.searchForPoolIdsForPendingWorkJobs(vo.getMsid()); if (poolIds.size() > 0) { for (Long poolId : poolIds) { @@ -1802,7 +1802,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C scopeType = Enum.valueOf(ScopeType.class, scope.toUpperCase()); } catch (Exception e) { - throw new InvalidParameterValueException("invalid scope" + scope); + throw new InvalidParameterValueException("invalid scope for cache store " + scope); } if (scopeType != ScopeType.ZONE) {
