Updated Branches: refs/heads/4.2 b67af3708 -> c22a73d5f
CLOUDSTACK-4281 : Usage - exception was hiding the db error. Make the usage job fail incase of any DB insert exceptions Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c22a73d5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c22a73d5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c22a73d5 Branch: refs/heads/4.2 Commit: c22a73d5fa64adfe4ac4e435fa8690a53a17d098 Parents: b67af37 Author: Kishan Kavala <[email protected]> Authored: Tue Aug 13 17:24:27 2013 +0530 Committer: Kishan Kavala <[email protected]> Committed: Tue Aug 13 17:35:24 2013 +0530 ---------------------------------------------------------------------- usage/src/com/cloud/usage/parser/NetworkUsageParser.java | 7 ++----- usage/src/com/cloud/usage/parser/VmDiskUsageParser.java | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c22a73d5/usage/src/com/cloud/usage/parser/NetworkUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/NetworkUsageParser.java b/usage/src/com/cloud/usage/parser/NetworkUsageParser.java index f2f24e4..4bf62d9 100644 --- a/usage/src/com/cloud/usage/parser/NetworkUsageParser.java +++ b/usage/src/com/cloud/usage/parser/NetworkUsageParser.java @@ -129,11 +129,8 @@ public static final Logger s_logger = Logger.getLogger(NetworkUsageParser.class. } } } - try { - m_usageDao.saveUsageRecords(usageRecords); - } catch (Exception ex) { - s_logger.error("Exception in usage manager", ex); - } + + m_usageDao.saveUsageRecords(usageRecords); return true; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c22a73d5/usage/src/com/cloud/usage/parser/VmDiskUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/VmDiskUsageParser.java b/usage/src/com/cloud/usage/parser/VmDiskUsageParser.java index 84bdfd2..b0cb2ff 100644 --- a/usage/src/com/cloud/usage/parser/VmDiskUsageParser.java +++ b/usage/src/com/cloud/usage/parser/VmDiskUsageParser.java @@ -157,11 +157,7 @@ public static final Logger s_logger = Logger.getLogger(VmDiskUsageParser.class.g } } - try { - m_usageDao.saveUsageRecords(usageRecords); - } catch (Exception ex) { - s_logger.error("Exception in usage manager", ex); - } + m_usageDao.saveUsageRecords(usageRecords); return true; }
