From b434f63fa625cbedd13ad0d63f5b2242322dab46 Mon Sep 17 00:00:00 2001 From: rdimaio Date: Thu, 2 May 2024 16:04:44 +0200 Subject: [PATCH] Auth: get_updated_account_counters, migrate query to SQLA2.0 and return as list For more information, see: https://github.com/rucio/rucio/pull/6497#discussion_r1494328498 --- lib/rucio/core/account_counter.py | 10 +++++++--- lib/rucio/daemons/abacus/account.py | 14 +++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/rucio/core/account_counter.py b/lib/rucio/core/account_counter.py index 869bf5c6d9..e9142bf003 100644 --- a/lib/rucio/core/account_counter.py +++ b/lib/rucio/core/account_counter.py @@ -90,12 +90,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) + + 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='CONCAT(account, rse_id)') - return query.all() + return [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 37dcd46c98..866d2cdafa 100644 --- a/lib/rucio/daemons/abacus/account.py +++ b/lib/rucio/daemons/abacus/account.py @@ -54,22 +54,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: