This is an automated email from the ASF dual-hosted git repository. vishesh pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 35fd17c62eeec877c71027fb32ad11bda4771c98 Merge: afdf4d7d46c a53365d1c7f Author: Vishesh <[email protected]> AuthorDate: Wed Jul 17 17:43:40 2024 +0530 Merge branch '4.19' .../api/command/user/backup/ListBackupsCmd.java | 1 + .../java/org/apache/cloudstack/backup/Backup.java | 1 + .../java/com/cloud/usage/dao/UsageDaoImpl.java | 35 +++++++++++--------- .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 1 + .../org/apache/cloudstack/backup/BackupVO.java | 1 + .../cloudstack/backup/dao/BackupDaoImpl.java | 6 +++- ...LibvirtOvsFetchInterfaceCommandWrapperTest.java | 8 +++-- .../api/command/SAML2LoginAPIAuthenticatorCmd.java | 1 + .../apache/cloudstack/saml/SAML2AuthManager.java | 19 ++++++----- .../cloudstack/saml/SAML2AuthManagerImpl.java | 7 ++++ .../command/SAML2LoginAPIAuthenticatorCmdTest.java | 4 +-- .../java/com/cloud/storage/StorageManagerImpl.java | 6 +--- .../cloud/event/ActionEventInterceptorTest.java | 38 ++++++++++++---------- ui/public/config.json | 4 +-- ui/public/index.html | 4 +-- ui/public/locales/en.json | 1 + ui/src/components/view/InfoCard.vue | 12 ------- ui/src/components/widgets/Console.vue | 9 +---- ui/src/config/section/account.js | 24 ++++++++++++++ ui/src/config/section/compute.js | 2 +- ui/src/config/section/domain.js | 16 +++++++++ ui/src/config/section/infra/hosts.js | 2 +- ui/src/config/section/infra/managementServers.js | 4 +-- 23 files changed, 126 insertions(+), 80 deletions(-) diff --cc api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java index 8597d97278c,57a1de2f105..7d87cc37e6c --- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java @@@ -116,6 -118,7 +116,7 @@@ public class ListBackupsCmd extends Bas Pair<List<Backup>, Integer> result = backupManager.listBackups(this); setupResponseBackupList(result.first(), result.second()); } catch (Exception e) { - s_logger.debug("Exception while listing backups", e); ++ logger.debug("Exception while listing backups", e); throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); } } diff --cc engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java index 2335043b7c5,3c900b604d8..b849378c705 --- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java @@@ -538,21 -541,25 +539,25 @@@ public class UsageDaoImpl extends Gener @Override public void removeOldUsageRecords(int days) { - String sql = DELETE_ALL_BY_INTERVAL; - TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB); - PreparedStatement pstmt = null; - try { - txn.start(); - pstmt = txn.prepareAutoCloseStatement(sql); - pstmt.setLong(1, days); - pstmt.executeUpdate(); - txn.commit(); - } catch (Exception ex) { - txn.rollback(); - logger.error("error removing old cloud_usage records for interval: " + days); - } finally { - txn.close(); - } + Transaction.execute(TransactionLegacy.USAGE_DB, new TransactionCallbackNoReturn() { + @Override + public void doInTransactionWithoutResult(TransactionStatus status) { + TransactionLegacy txn = TransactionLegacy.currentTxn(); + PreparedStatement pstmt = null; + try { + txn.start(); + pstmt = txn.prepareAutoCloseStatement(DELETE_ALL_BY_INTERVAL); + pstmt.setLong(1, days); + pstmt.executeUpdate(); + txn.commit(); + } catch (Exception ex) { + txn.rollback(); - s_logger.error("error removing old cloud_usage records for interval: " + days); ++ logger.error("error removing old cloud_usage records for interval: " + days); + } finally { + txn.close(); + } + } + }); } public UsageVO persistUsage(final UsageVO usage) {
