From f322981d1ee464148cf326b12c62349d5804cd14 Mon Sep 17 00:00:00 2001 From: rdimaio Date: Thu, 7 Mar 2024 18:41:54 +0100 Subject: [PATCH] Auth: Migrate to SQLAlchemy 2.0 syntax; #6057 --- lib/rucio/core/account_counter.py | 15 +++++++-------- lib/rucio/daemons/abacus/account.py | 14 +++++++------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/rucio/core/account_counter.py b/lib/rucio/core/account_counter.py index c0626bd9f8..34957a6549 100644 --- a/lib/rucio/core/account_counter.py +++ b/lib/rucio/core/account_counter.py @@ -91,17 +91,16 @@ def get_updated_account_counters(total_workers, worker_number, *, session: "Sess :param session: Database session in use. :returns: List of rse_ids whose rse_counters need to be updated. """ - query = session.query(models.UpdatedAccountCounter.account, models.UpdatedAccountCounter.rse_id).\ - distinct(models.UpdatedAccountCounter.account, models.UpdatedAccountCounter.rse_id) - if session.bind.dialect.name == 'oracle': - hash_variable = 'CONCAT(account, rse_id)''' - else: - hash_variable = 'concat(account, rse_id)' + query = select( + models.UpdatedAccountCounter.account, + models.UpdatedAccountCounter.rse_id, + ).distinct( + ) - query = filter_thread_work(session=session, query=query, total_threads=total_workers, thread_id=worker_number, hash_variable=hash_variable) + query = filter_thread_work(session=session, query=query, total_threads=total_workers, thread_id=worker_number, hash_variable='CONCAT(account, rse_id)') - return query.all() + return [cast(RSEAccountCounterDict, row._asdict()) for row in session.execute(query).all()] @transactional_session diff --git a/lib/rucio/daemons/abacus/account.py b/lib/rucio/daemons/abacus/account.py index 78de5d45c4..273111e6d9 100644 --- a/lib/rucio/daemons/abacus/account.py +++ b/lib/rucio/daemons/abacus/account.py @@ -55,22 +55,22 @@ def run_once(heartbeat_handler, **_kwargs): worker_number, total_workers, logger = heartbeat_handler.live() start = time.time() # NOQA - account_rse_ids = get_updated_account_counters(total_workers=total_workers, - worker_number=worker_number) - logger(logging.DEBUG, 'Index query time %f size=%d' % (time.time() - start, len(account_rse_ids))) + updated_account_counters = get_updated_account_counters(total_workers=total_workers, + worker_number=worker_number) + logger(logging.DEBUG, 'Index query time %f size=%d' % (time.time() - start, len(updated_account_counters))) # If the list is empty, sent the worker to sleep - if not account_rse_ids: + if not updated_account_counters: logger(logging.INFO, 'did not get any work') return - for account_rse_id in account_rse_ids: + for account_counter in updated_account_counters: worker_number, total_workers, logger = heartbeat_handler.live() if graceful_stop.is_set(): break start_time = time.time() - update_account_counter(account=account_rse_id[0], rse_id=account_rse_id[1]) - logger(logging.DEBUG, 'update of account-rse counter "%s-%s" took %f' % (account_rse_id[0], account_rse_id[1], time.time() - start_time)) + update_account_counter(account=account_counter['account'], rse_id=account_counter['rse_id']) + logger(logging.DEBUG, 'update of account-rse counter "%s-%s" took %f' % (account_counter['account'], account_counter['rse_id'], time.time() - start_time)) def stop(signum: "Optional[int]" = None, frame: "Optional[FrameType]" = None) -> None: