From 044429c3902010b0e74e5649c08c7b590dbab165 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 29 Apr 2019 08:20:37 +0000 Subject: [PATCH 1/2] server: Fix exception while update domain resource count (#3204) reimplement 3204 on moved file in 4.12 --- .../com/cloud/configuration/dao/ResourceCountDaoImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java index 4bd8302a3456..9b6734d128c2 100644 --- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java @@ -266,18 +266,18 @@ public long countMemoryAllocatedToAccount(long accountId) { } private long executeSqlCountComputingResourcesForAccount(long accountId, String sqlCountComputingResourcesAllocatedToAccount) { - try (TransactionLegacy tx = TransactionLegacy.currentTxn()) { + TransactionLegacy tx = TransactionLegacy.currentTxn() + try { PreparedStatement pstmt = tx.prepareAutoCloseStatement(sqlCountComputingResourcesAllocatedToAccount); pstmt.setLong(1, accountId); ResultSet rs = pstmt.executeQuery(); if (!rs.next()) { - throw new CloudRuntimeException(String.format("An unexpected case happened while counting allocated computing resources for account: " + accountId)); + return 0L; } return rs.getLong("total"); } catch (SQLException e) { throw new CloudRuntimeException(e); } } - -} \ No newline at end of file +} From 4a9386726207bf6a374b1ee5bffad6e5c4129dbf Mon Sep 17 00:00:00 2001 From: dahn Date: Wed, 1 May 2019 07:34:43 +0200 Subject: [PATCH 2/2] missing ; --- .../java/com/cloud/configuration/dao/ResourceCountDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java index 9b6734d128c2..edda68268934 100644 --- a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java @@ -266,7 +266,7 @@ public long countMemoryAllocatedToAccount(long accountId) { } private long executeSqlCountComputingResourcesForAccount(long accountId, String sqlCountComputingResourcesAllocatedToAccount) { - TransactionLegacy tx = TransactionLegacy.currentTxn() + TransactionLegacy tx = TransactionLegacy.currentTxn(); try { PreparedStatement pstmt = tx.prepareAutoCloseStatement(sqlCountComputingResourcesAllocatedToAccount); pstmt.setLong(1, accountId);