rucio 37.4.0__py3-none-any.whl → 37.6.0__py3-none-any.whl

rucio/daemons/judge/injector.py

@@ -33,7 +33,7 @@ from rucio.common.logging import setup_logging
 from rucio.core.monitor import MetricManager
 from rucio.core.rule import get_injected_rules, inject_rule, update_rule
 from rucio.daemons.common import HeartbeatHandler, run_daemon
-from rucio.db.sqla.constants import ORACLE_CONNECTION_LOST_CONTACT_REGEX, ORACLE_RESOURCE_BUSY_REGEX
+from rucio.db.sqla.constants import MYSQL_LOCK_NOWAIT_REGEX, ORACLE_CONNECTION_LOST_CONTACT_REGEX, ORACLE_RESOURCE_BUSY_REGEX, PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX
 
 if TYPE_CHECKING:
     from types import FrameType
@@ -99,7 +99,7 @@ def run_once(
             inject_rule(rule_id=rule_id, logger=logger)
             logger(logging.DEBUG, 'injection of %s took %f' % (rule_id, time.time() - start))
         except (DatabaseException, DatabaseError) as e:
-            if match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])):
+            if match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])) or match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(e.args[0])) or match(MYSQL_LOCK_NOWAIT_REGEX, str(e.args[0])):
                 paused_rules[rule_id] = datetime.utcnow() + timedelta(seconds=randint(60, 600))  # noqa: S311
                 METRICS.counter('exceptions.{exception}').labels(exception='LocksDetected').inc()
                 logger(logging.WARNING, 'Locks detected for %s' % rule_id)

rucio/daemons/judge/repairer.py

@@ -35,7 +35,7 @@ from rucio.common.logging import setup_logging
 from rucio.core.monitor import MetricManager
 from rucio.core.rule import get_stuck_rules, repair_rule
 from rucio.daemons.common import HeartbeatHandler, run_daemon
-from rucio.db.sqla.constants import ORACLE_CONNECTION_LOST_CONTACT_REGEX, ORACLE_RESOURCE_BUSY_REGEX
+from rucio.db.sqla.constants import MYSQL_LOCK_NOWAIT_REGEX, ORACLE_CONNECTION_LOST_CONTACT_REGEX, ORACLE_RESOURCE_BUSY_REGEX, PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX
 
 if TYPE_CHECKING:
     from types import FrameType
@@ -106,7 +106,7 @@ def run_once(
             repair_rule(rule_id=rule_id)
             logger(logging.DEBUG, 'repairing of %s took %f' % (rule_id, time.time() - start))
         except (DatabaseException, DatabaseError) as e:
-            if match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])):
+            if match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])) or match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(e.args[0])) or match(MYSQL_LOCK_NOWAIT_REGEX, str(e.args[0])):
                 paused_rules[rule_id] = datetime.utcnow() + timedelta(seconds=randint(600, 2400))  # noqa: S311
                 logger(logging.WARNING, 'Locks detected for %s' % (rule_id))
                 METRICS.counter('exceptions.{exception}').labels(exception='LocksDetected').inc()

rucio/daemons/replicarecoverer/suspicious_replica_recoverer.py

@@ -198,7 +198,7 @@ def run_once(heartbeat_handler: Any, younger_than: int, nattempts: int, vos: "Op
     try:
         json_file = open(json_file_name, mode="r")
         logger(logging.INFO, "JSON file has been opened.")
-    except:
+    except Exception:
         logger(logging.WARNING, "An error occurred while trying to open the JSON file.")
         must_sleep = True
         return must_sleep

rucio/daemons/storage/consistency/actions.py

@@ -166,7 +166,7 @@ class Stats:
         try:
             with open(self.path, "r") as f:
                 data = f.read()
-        except:
+        except Exception:
             data = ""
         data = json.loads(data or "{}")
         data.update(self.Data)
@@ -332,7 +332,7 @@ def was_cc_attempted(
 ) -> Optional[bool]:
     try:
         f = open(stats_file, "r")
-    except:
+    except Exception:
         print("get_data: error ", stats_file)
         return None
     stats = json.loads(f.read())
@@ -347,7 +347,7 @@ def was_cc_processed(
 ) -> Optional[bool]:
     try:
         f = open(stats_file, "r")
-    except:
+    except Exception:
         print("get_data: error ", stats_file)
         return None
     stats = json.loads(f.read())

rucio/daemons/transmogrifier/transmogrifier.py

@@ -492,7 +492,7 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
     #  List all the active subscriptions
     subscriptions = get_subscriptions(logger=logger)
 
-    #  Loop over all the new dids
+    #  Loop over all the new DIDs
     #  Get the new DIDs based on the is_new flag
     logger(logging.DEBUG, "Listing new dids")
     for did in list_new_dids(

rucio/daemons/undertaker/undertaker.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 '''
-Undertaker is a daemon to manage expired did.
+Undertaker is a daemon to manage expired DID.
 '''
 
 import functools
@@ -36,7 +36,7 @@ from rucio.common.utils import chunks
 from rucio.core.did import delete_dids, list_expired_dids
 from rucio.core.monitor import MetricManager
 from rucio.daemons.common import HeartbeatHandler, run_daemon
-from rucio.db.sqla.constants import MYSQL_LOCK_NOWAIT_REGEX, ORACLE_RESOURCE_BUSY_REGEX, PSQL_LOCK_NOT_AVAILABLE_REGEX
+from rucio.db.sqla.constants import MYSQL_LOCK_NOWAIT_REGEX, ORACLE_RESOURCE_BUSY_REGEX, PSQL_LOCK_NOT_AVAILABLE_REGEX, PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX
 
 if TYPE_CHECKING:
     from types import FrameType
@@ -51,7 +51,7 @@ DAEMON_NAME = 'undertaker'
 
 def undertaker(once: bool = False, sleep_time: int = 60, chunk_size: int = 10) -> None:
     """
-    Main loop to select and delete dids.
+    Main loop to select and delete DIDs.
     """
     paused_dids = {}  # {(scope, name): datetime}
     run_daemon(
@@ -72,7 +72,7 @@ def run_once(paused_dids: dict[tuple, datetime], chunk_size: int, heartbeat_hand
     worker_number, total_workers, logger = heartbeat_handler.live()
 
     try:
-        # Refresh paused dids
+        # Refresh paused DIDs
         iter_paused_dids = deepcopy(paused_dids)
         for key in iter_paused_dids:
             if datetime.utcnow() > paused_dids[key]:
@@ -96,14 +96,14 @@ def run_once(paused_dids: dict[tuple, datetime], chunk_size: int, heartbeat_hand
             except RuleNotFound as error:
                 logger(logging.ERROR, error)
             except (DatabaseException, DatabaseError, UnsupportedOperation) as e:
-                if match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])) or match(PSQL_LOCK_NOT_AVAILABLE_REGEX, str(e.args[0])) or match(MYSQL_LOCK_NOWAIT_REGEX, str(e.args[0])):
+                if match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])) or match(PSQL_LOCK_NOT_AVAILABLE_REGEX, str(e.args[0])) or match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(e.args[0])) or match(MYSQL_LOCK_NOWAIT_REGEX, str(e.args[0])):
                     for did in chunk:
                         paused_dids[(did['scope'], did['name'])] = datetime.utcnow() + timedelta(seconds=randint(600, 2400))  # noqa: S311
                     METRICS.counter('delete_dids.exceptions.{exception}').labels(exception='LocksDetected').inc()
                     logger(logging.WARNING, 'Locks detected for chunk')
                 else:
                     logger(logging.ERROR, 'Got database error %s.', str(e))
-    except:
+    except Exception:
         logging.critical(traceback.format_exc())
 
 

rucio/db/sqla/constants.py

@@ -26,6 +26,7 @@ ORACLE_DEADLOCK_DETECTED_REGEX = r".*ORA-00060.*"
 ORACLE_RESOURCE_BUSY_REGEX = r".*ORA-00054.*"
 ORACLE_UNIQUE_CONSTRAINT_VIOLATED_REGEX = r".*ORA-00001.*"
 PSQL_LOCK_NOT_AVAILABLE_REGEX = r".*55P03.*"
+PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX = r".*psycopg.errors.LockNotAvailable.*"
 MYSQL_LOCK_NOWAIT_REGEX = r".*3572.*"
 MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED = "ERROR 1205 (HY000)"
 
@@ -196,9 +197,9 @@ class SubscriptionState(Enum):
     BROKEN = 'B'
 
 
-class TransferLimitDirection(Enum):
-    SOURCE = 'S'
-    DESTINATION = 'D'
+# class TransferLimitDirection(Enum):
+#     SOURCE = 'S'
+#     DESTINATION = 'D'
 
 
 class DatabaseOperationType(Enum):

rucio/db/sqla/migrate_repo/versions/13d4f70c66a9_introduce_transfer_limits.py

@@ -19,7 +19,7 @@ import sqlalchemy as sa
 from alembic import context
 from alembic.op import create_check_constraint, create_foreign_key, create_index, create_primary_key, create_table, drop_table
 
-from rucio.db.sqla.constants import TransferLimitDirection
+from rucio.common.constants import TransferLimitDirection
 from rucio.db.sqla.types import GUID
 
 # Alembic revision identifiers

rucio/db/sqla/migrate_repo/versions/3082b8cef557_add_naming_convention_table_and_closed_.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-''' add convention table and closed_at to dids '''
+''' add convention table and closed_at to DIDs '''
 
 import datetime
 

rucio/db/sqla/migrate_repo/versions/4df2c5ddabc0_remove_temporary_dids.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-''' remove temporary dids '''
+''' remove temporary DIDs '''
 
 import sqlalchemy as sa
 from alembic import context

rucio/db/sqla/migrate_repo/versions/c129ccdb2d5_add_lumiblocknr_to_dids.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-''' add lumiblocknr to dids '''
+''' add lumiblocknr to DIDs '''
 
 import sqlalchemy as sa
 from alembic import context

rucio/db/sqla/models.py

@@ -29,6 +29,7 @@ from sqlalchemy.types import LargeBinary
 # and it must be renamed to avoid conflicts with the policy package schema modules
 from rucio.common import schema as common_schema
 from rucio.common import utils
+from rucio.common.constants import TransferLimitDirection
 from rucio.common.types import InternalAccount, InternalScope  # noqa: TCH001 (types are needed by SQLAlchemy)
 from rucio.db.sqla.constants import (
     AccountStatus,
@@ -51,7 +52,6 @@ from rucio.db.sqla.constants import (
     RuleState,
     ScopeStatus,
     SubscriptionState,
-    TransferLimitDirection,
 )
 from rucio.db.sqla.session import BASE
 from rucio.db.sqla.types import GUID, JSON, BooleanString, InternalAccountString, InternalScopeString
@@ -563,7 +563,7 @@ class DeletedDataIdentifier(BASE, ModelBase):
 
 
 class UpdatedDID(BASE, ModelBase):
-    """Represents the recently updated dids"""
+    """Represents the recently updated DIDs"""
     __tablename__ = 'updated_dids'
     id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid)
     scope: Mapped[InternalScope] = mapped_column(InternalScopeString(common_schema.get_schema_value('SCOPE_LENGTH')))

rucio/db/sqla/session.py

@@ -54,7 +54,7 @@ if TYPE_CHECKING:
 try:
     main_script = os.path.basename(sys.argv[0])
     CURRENT_COMPONENT = main_script.split('-')[1]
-except:
+except Exception:
     CURRENT_COMPONENT = None
 
 DATABASE_SECTION = 'database'
@@ -63,7 +63,7 @@ try:
         sql_connection = config_get('%s-database' % CURRENT_COMPONENT, 'default', check_config_table=False).strip()
         if sql_connection and len(sql_connection):
             DATABASE_SECTION = '%s-database' % CURRENT_COMPONENT
-except:
+except Exception:
     pass
 
 DEFAULT_SCHEMA_NAME = config_get(DATABASE_SECTION, 'schema',
@@ -221,7 +221,7 @@ def get_engine() -> 'Engine':
         for param, param_type in config_params:
             try:
                 params[param] = param_type(config_get(DATABASE_SECTION, param, check_config_table=False))
-            except:
+            except Exception:
                 pass
         _ENGINE = create_engine(sql_connection, **params)
         if 'mysql' in sql_connection:
@@ -406,7 +406,7 @@ def read_session(function: "Callable[P, R]"):
             except DatabaseError as error:
                 session.rollback()  # type: ignore
                 raise DatabaseException(str(error))
-            except:
+            except Exception:
                 session.rollback()  # type: ignore
                 raise
             finally:
@@ -451,7 +451,7 @@ def stream_session(function: "Callable[P, R]"):
             except DatabaseError as error:
                 session.rollback()  # type: ignore
                 raise DatabaseException(str(error))
-            except:
+            except Exception:
                 session.rollback()  # type: ignore
                 raise
             finally:
@@ -460,7 +460,7 @@ def stream_session(function: "Callable[P, R]"):
             try:
                 for row in function(*args, session=session, **kwargs):
                     yield row
-            except:
+            except Exception:
                 raise
     return _update_session_wrapper(new_funct, function)
 
@@ -491,7 +491,7 @@ def transactional_session(function: "Callable[P, R]") -> 'Callable':
             except DatabaseError as error:
                 session.rollback()  # type: ignore
                 raise DatabaseException(str(error))
-            except:
+            except Exception:
                 session.rollback()  # type: ignore
                 raise
             finally:

rucio/gateway/account.py

@@ -22,27 +22,22 @@ from rucio.common.types import InternalAccount
 from rucio.common.utils import gateway_update_return_dict
 from rucio.core import account as account_core
 from rucio.core.rse import get_rse_id
-from rucio.db.sqla.constants import AccountType
-from rucio.db.sqla.session import read_session, stream_session, transactional_session
+from rucio.db.sqla.constants import AccountType, DatabaseOperationType
+from rucio.db.sqla.session import db_session
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from sqlalchemy.orm import Session
-
     from rucio.common.types import AccountAttributesDict, IdentityDict, UsageDict
     from rucio.db.sqla.models import Account
 
 
-@transactional_session
 def add_account(
     account: str,
     type_: str,
     email: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Creates an account with the provided account name, contact information, etc.
@@ -53,29 +48,27 @@ def add_account(
 
     :param issuer: The issuer account_core.
     :param vo: The VO to act on.
-    :param session: The database session in use.
 
     """
 
     validate_schema(name='account', obj=account, vo=vo)
 
     kwargs = {'account': account, 'type': type_}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_account', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not add account. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_account', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not add account. %s' % (issuer, auth_result.message))
+
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.add_account(internal_account, AccountType[type_.upper()], email, session=session)
+        account_core.add_account(internal_account, AccountType[type_.upper()], email, session=session)
 
 
-@transactional_session
 def del_account(
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Disables an account with the provided account name.
@@ -83,25 +76,22 @@ def del_account(
     :param account: The account name.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
 
     """
     kwargs = {'account': account}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_account', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not delete account. %s' % (issuer, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_account', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not delete account. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.del_account(internal_account, session=session)
+        account_core.del_account(internal_account, session=session)
 
 
-@read_session
 def get_account_info(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> "Account":
     """
     Returns the info like the statistics information associated to an account_core.
@@ -109,25 +99,23 @@ def get_account_info(
     :param account: The account name.
     :returns: A list with all account information.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    acc = account_core.get_account(internal_account, session=session)
-    acc.account = acc.account.external
-    return acc
+    with db_session(DatabaseOperationType.READ) as session:
+        acc = account_core.get_account(internal_account, session=session)
+        acc.account = acc.account.external
+        return acc
 
 
-@transactional_session
 def update_account(
     account: str,
     key: str,
     value: Any,
     issuer: str = 'root',
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """ Update a property of an account_core.
 
@@ -136,21 +124,21 @@ def update_account(
     :param value: Property value.
     :param issuer: The issuer account
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
     validate_schema(name='account', obj=account, vo=vo)
     kwargs = {}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='update_account', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not change %s  of the account. %s' % (issuer, key, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='update_account', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not change %s  of the account. %s' % (issuer, key, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.update_account(internal_account, key, value, session=session)
+        return account_core.update_account(internal_account, key, value, session=session)
 
 
-@stream_session
-def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def', *, session: "Session") -> 'Iterator[dict[str, Any]]':
+def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def') -> 'Iterator[dict[str, Any]]':
     """
     Lists all the Rucio account names.
 
@@ -158,7 +146,6 @@ def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def', *,
 
     :param filter_: Dictionary of attributes by which the input data should be filtered
     :param vo: The VO to act on.
-    :param session: The database session in use.
 
     :returns: List of all accounts.
     """
@@ -169,80 +156,73 @@ def list_accounts(filter_: Optional[dict[str, Any]] = None, vo: str = 'def', *,
         filter_['account'] = InternalAccount(filter_['account'], vo=vo)
     else:
         filter_['account'] = InternalAccount(account='*', vo=vo)
-    for result in account_core.list_accounts(filter_=filter_, session=session):
-        yield gateway_update_return_dict(result, session=session)
+
+    with db_session(DatabaseOperationType.READ) as session:
+        for result in account_core.list_accounts(filter_=filter_, session=session):
+            yield gateway_update_return_dict(result, session=session)
 
 
-@read_session
 def account_exists(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> bool:
     """
     Checks to see if account exists. This procedure does not check it's status.
 
     :param account: Name of the account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     :returns: True if found, otherwise false.
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.account_exists(internal_account, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        return account_core.account_exists(internal_account, session=session)
 
 
-@read_session
 def list_identities(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> list["IdentityDict"]:
     """
     List all identities on an account_core.
 
     :param account: The account name.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.list_identities(internal_account, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        return account_core.list_identities(internal_account, session=session)
 
 
-@read_session
 def list_account_attributes(
     account: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> list["AccountAttributesDict"]:
     """
     Returns all the attributes for the given account.
 
     :param account: The account name.
     :param vo: The VO to act on
-    :param session: The database session in use.
+
     """
 
     internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.list_account_attributes(internal_account, session=session)
+    with db_session(DatabaseOperationType.READ) as session:
+        return account_core.list_account_attributes(internal_account, session=session)
 
 
-@transactional_session
 def add_account_attribute(
     key: str,
     value: Any,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Add an attribute to an account.
@@ -252,29 +232,27 @@ def add_account_attribute(
     :param account: The account name.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
     validate_schema(name='account_attribute', obj=key, vo=vo)
     validate_schema(name='account_attribute', obj=value, vo=vo)
 
     kwargs = {'account': account, 'key': key, 'value': value}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_attribute', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not add attributes. %s' % (issuer, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='add_attribute', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not add attributes. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.add_account_attribute(internal_account, key, value, session=session)
+        account_core.add_account_attribute(internal_account, key, value, session=session)
 
 
-@transactional_session
 def del_account_attribute(
     key: str,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> None:
     """
     Delete an attribute to an account.
@@ -283,26 +261,24 @@ def del_account_attribute(
     :param account: The account name.
     :param issuer: The issuer account.
     :param vo: The VO to act on.
-    :param session: The database session in use.
+
     """
     kwargs = {'account': account, 'key': key}
-    auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_attribute', kwargs=kwargs, session=session)
-    if not auth_result.allowed:
-        raise rucio.common.exception.AccessDenied('Account %s can not delete attribute. %s' % (issuer, auth_result.message))
+    with db_session(DatabaseOperationType.WRITE) as session:
+        auth_result = rucio.gateway.permission.has_permission(issuer=issuer, vo=vo, action='del_attribute', kwargs=kwargs, session=session)
+        if not auth_result.allowed:
+            raise rucio.common.exception.AccessDenied('Account %s can not delete attribute. %s' % (issuer, auth_result.message))
 
-    internal_account = InternalAccount(account, vo=vo)
+        internal_account = InternalAccount(account, vo=vo)
 
-    account_core.del_account_attribute(internal_account, key, session=session)
+        account_core.del_account_attribute(internal_account, key, session=session)
 
 
-@read_session
 def get_usage(
     rse: str,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> "UsageDict":
     """
     Returns current values of the specified counter, or raises CounterNotFound if the counter does not exist.
@@ -311,23 +287,21 @@ def get_usage(
     :param account:          The account name.
     :param issuer:           The issuer account.
     :param vo:               The VO to act on.
-    :param session:          The database session in use.
+
     :returns:                A dictionary with total and bytes.
     """
-    rse_id = get_rse_id(rse=rse, vo=vo, session=session)
-    internal_account = InternalAccount(account, vo=vo)
+    with db_session(DatabaseOperationType.READ) as session:
+        rse_id = get_rse_id(rse=rse, vo=vo, session=session)
+        internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.get_usage(rse_id, internal_account, session=session)
+        return account_core.get_usage(rse_id, internal_account, session=session)
 
 
-@read_session
 def get_usage_history(
     rse: str,
     account: str,
     issuer: str,
     vo: str = 'def',
-    *,
-    session: "Session"
 ) -> list["UsageDict"]:
     """
     Returns historical values of the specified counter, or raises CounterNotFound if the counter does not exist.
@@ -336,10 +310,11 @@ def get_usage_history(
     :param account:          The account name.
     :param issuer:           The issuer account.
     :param vo:               The VO to act on.
-    :param session:          The database session in use.
+
     :returns:                A dictionary with total and bytes.
     """
-    rse_id = get_rse_id(rse=rse, vo=vo, session=session)
-    internal_account = InternalAccount(account, vo=vo)
+    with db_session(DatabaseOperationType.READ) as session:
+        rse_id = get_rse_id(rse=rse, vo=vo, session=session)
+        internal_account = InternalAccount(account, vo=vo)
 
-    return account_core.get_usage_history(rse_id, internal_account, session=session)
+        return account_core.get_usage_history(rse_id, internal_account, session=session)