rucio 37.5.0__py3-none-any.whl → 37.7.0__py3-none-any.whl

rucio/core/rse.py

@@ -29,7 +29,7 @@ from rucio.common import exception, types, utils
 from rucio.common.cache import MemcacheRegion
 from rucio.common.checksum import CHECKSUM_KEY, GLOBALLY_SUPPORTED_CHECKSUMS
 from rucio.common.config import get_lfn2pfn_algorithm_default
-from rucio.common.constants import RSE_ALL_SUPPORTED_PROTOCOL_OPERATIONS, RSE_ATTRS_BOOL, RSE_ATTRS_STR, SUPPORTED_SIGN_URL_SERVICES_LITERAL, RseAttr
+from rucio.common.constants import DEFAULT_VO, RSE_ALL_SUPPORTED_PROTOCOL_OPERATIONS, RSE_ATTRS_BOOL, RSE_ATTRS_STR, SUPPORTED_SIGN_URL_SERVICES_LITERAL, RseAttr
 from rucio.common.utils import Availability
 from rucio.core.rse_counter import add_counter, get_counter
 from rucio.db.sqla import models
@@ -415,7 +415,7 @@ def _group_query_result_by_rse_id(
 @transactional_session
 def add_rse(
     rse: str,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     deterministic: bool = True,
     volatile: bool = False,
     city: Optional[str] = None,
@@ -497,7 +497,7 @@ def add_rse(
 @read_session
 def rse_exists(
     rse: str,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     include_deleted: bool = False,
     *,
     session: "Session"
@@ -662,7 +662,7 @@ def get_rse(
 @read_session
 def get_rse_id(
     rse: str,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     include_deleted: bool = True,
     *,
     session: "Session"
@@ -680,7 +680,7 @@ def get_rse_id(
     """
 
     if include_deleted:
-        if vo != 'def':
+        if vo != DEFAULT_VO:
             cache_key = 'rse-id_{}@{}'.format(rse, vo).replace(' ', '.')
         else:
             cache_key = 'rse-id_{}'.format(rse).replace(' ', '.')
@@ -1035,7 +1035,7 @@ def get_rses_with_attribute(
 def get_rses_with_attribute_value(
     key: str,
     value: Union[bool, str],
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> list[dict[str, str]]:
@@ -1048,7 +1048,7 @@ def get_rses_with_attribute_value(
 
     :returns: List of rse dictionaries with the rse_id and rse_name
     """
-    if vo != 'def':
+    if vo != DEFAULT_VO:
         cache_key = 'av-%s-%s@%s' % (key, value, vo)
     else:
         cache_key = 'av-%s-%s' % (key, value)

rucio/core/rule.py

@@ -37,7 +37,7 @@ import rucio.core.lock  # import get_replica_locks, get_files_and_replica_locks_
 import rucio.core.replica  # import get_and_lock_file_replicas, get_and_lock_file_replicas_for_dataset
 from rucio.common.cache import MemcacheRegion
 from rucio.common.config import config_get
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import (
     DataIdentifierNotFound,
     DuplicateRule,
@@ -191,7 +191,7 @@ def add_rule(
     logger: LoggerFunction = logging.log
 ) -> list[str]:
     """
-    Adds a replication rule for every did in dids
+    Adds a replication rule for every DID in DIDs
 
     :param dids:                       List of data identifiers.
     :param account:                    Account issuing the rule.
@@ -277,7 +277,7 @@ def add_rule(
         notify_value = {'Y': RuleNotification.YES, 'C': RuleNotification.CLOSE, 'P': RuleNotification.PROGRESS}.get(notify or '', RuleNotification.NO)
 
         for elem in dids:
-            # 3. Get the did
+            # 3. Get the DID
             with METRICS.timer('add_rule.get_did'):
                 try:
                     stmt = select(
@@ -292,7 +292,7 @@ def add_rule(
                 except TypeError as error:
                     raise InvalidObject(error.args) from error  # https://pylint.readthedocs.io/en/latest/user_guide/messages/warning/raise-missing-from.html
 
-            # 3.1 If the did is a constituent, relay the rule to the archive
+            # 3.1 If the DID is a constituent, relay the rule to the archive
             if did.did_type == DIDType.FILE and did.constituent:
                 # Check if a single replica of this DID exists; Do not put rule on file if there are only replicas on TAPE
                 stmt = select(
@@ -407,7 +407,7 @@ def add_rule(
                 logger(logging.DEBUG, "Forced injection of rule %s", str(new_rule.id))
 
             if asynchronous or delay_injection:
-                # TODO: asynchronous mode only available for closed dids (on the whole tree?)
+                # TODO: asynchronous mode only available for closed DIDs (on the whole tree?)
                 new_rule.state = RuleState.INJECT
                 logger(logging.DEBUG, "Created rule %s for injection", str(new_rule.id))
                 if delay_injection:
@@ -485,7 +485,7 @@ def add_rules(
     logger: LoggerFunction = logging.log
 ) -> dict[tuple[InternalScope, str], list[str]]:
     """
-    Adds a list of replication rules to every did in dids
+    Adds a list of replication rules to every DID in DIDs
 
     :params dids:    List of data identifiers.
     :param rules:    List of dictionaries defining replication rules.
@@ -521,7 +521,7 @@ def add_rules(
             all_source_rses = list(set([rse['id'] for rse in all_source_rses]))
 
         for elem in dids:
-            # 2. Get the did
+            # 2. Get the DID
             with METRICS.timer('add_rules.get_did'):
                 try:
                     stmt = select(
@@ -536,7 +536,7 @@ def add_rules(
                 except TypeError as error:
                     raise InvalidObject(error.args) from error
 
-            # 2.1 If the did is a constituent, relay the rule to the archive
+            # 2.1 If the DID is a constituent, relay the rule to the archive
             if did.did_type == DIDType.FILE and did.constituent:  # Check if a single replica of this DID exists
                 stmt = select(
                     func.count()
@@ -584,7 +584,7 @@ def add_rules(
 
             rule_ids[(elem['scope'], elem['name'])] = []
 
-            # 3. Resolve the did into its contents
+            # 3. Resolve the DID into its contents
             with METRICS.timer('add_rules.resolve_dids_to_locks_replicas'):
                 # Get all Replicas, not only the ones interesting for the rse_expression
                 datasetfiles, locks, replicas, source_replicas = __resolve_did_to_locks_and_replicas(did=did,
@@ -828,7 +828,7 @@ def inject_rule(
         dids = [{'scope': dataset['scope'], 'name': dataset['name']} for dataset in rucio.core.did.list_child_datasets(scope=rule.scope, name=rule.name, session=session)]
         # Remove duplicates from the list of dictionaries
         dids = [dict(t) for t in {tuple(d.items()) for d in dids}]
-        # Remove dids which already have a similar rule
+        # Remove DIDs which already have a similar rule
         stmt = select(
             models.ReplicationRule.id
         ).where(
@@ -881,7 +881,7 @@ def inject_rule(
     with METRICS.timer('inject_rule.create_rse_selector'):
         rseselector = RSESelector(account=rule['account'], rses=rses, weight=rule.weight, copies=rule.copies, ignore_account_limit=rule.ignore_account_limit, session=session)
 
-    # 3. Get the did
+    # 3. Get the DID
     with METRICS.timer('inject_rule.get_did'):
         try:
             stmt = select(
@@ -1104,7 +1104,7 @@ def list_associated_rules_for_file(
     :param session: The database session in use.
     :raises:        RucioException
     """
-    rucio.core.did.get_did(scope=scope, name=name, session=session)  # Check if the did actually exists
+    rucio.core.did.get_did(scope=scope, name=name, session=session)  # Check if the DID actually exists
     stmt = select(
         models.ReplicationRule,
         models.DataIdentifier.bytes
@@ -1364,7 +1364,7 @@ def repair_rule(
                 rule.locks_stuck_cnt = count.state_counter
         logger(logging.DEBUG, "Finished resetting counters for rule %s [%d/%d/%d]", str(rule.id), rule.locks_ok_cnt, rule.locks_replicating_cnt, rule.locks_stuck_cnt)
 
-        # Get the did
+        # Get the DID
         stmt = select(
             models.DataIdentifier
         ).where(
@@ -1387,7 +1387,7 @@ def repair_rule(
             hard_repair = True
             logger(logging.DEBUG, 'Repairing rule %s in HARD mode', str(rule.id))
 
-        # Resolve the did to its contents
+        # Resolve the DID to its contents
         datasetfiles, locks, replicas, source_replicas = __resolve_did_to_locks_and_replicas(did=did,
                                                                                              nowait=True,
                                                                                              restrict_rses=[rse['id'] for rse in rses],
@@ -2060,10 +2060,10 @@ def re_evaluate_did(
     logger: LoggerFunction = logging.log
 ) -> None:
     """
-    Re-Evaluates a did.
+    Re-Evaluates a DID.
 
-    :param scope:                   The scope of the did to be re-evaluated.
-    :param name:                    The name of the did to be re-evaluated.
+    :param scope:                   The scope of the DID to be re-evaluated.
+    :param name:                    The name of the DID to be re-evaluated.
     :param rule_evaluation_action:  The Rule evaluation action.
     :param session:                 The database session in use.
     :param logger:                  Optional decorated logger that can be passed from the calling daemons or servers.
@@ -2086,7 +2086,7 @@ def re_evaluate_did(
     else:
         __evaluate_did_detach(did, session=session, logger=logger)
 
-    # Update size and length of did
+    # Update size and length of DID
     if session.bind.dialect.name == 'oracle':
         stmt = select(
             func.sum(models.DataIdentifierAssociation.bytes),
@@ -2118,12 +2118,12 @@ def get_updated_dids(
     session: "Session"
 ) -> list[tuple[str, InternalScope, str, DIDReEvaluation]]:
     """
-    Get updated dids.
+    Get updated DIDs.
 
     :param total_workers:      Number of total workers.
     :param worker_number:      id of the executing worker.
-    :param limit:              Maximum number of dids to return.
-    :param blocked_dids:       Blocked dids to filter.
+    :param limit:              Maximum number of DIDs to return.
+    :param blocked_dids:       Blocked DIDs to filter.
     :param session:            Database session in use.
     """
     blocked_dids = blocked_dids or []
@@ -2135,7 +2135,7 @@ def get_updated_dids(
     )
     stmt = filter_thread_work(session=session, query=stmt, total_threads=total_workers, thread_id=worker_number, hash_variable='name')
 
-    # Remove blocked dids from query, but only do the first 30 ones, not to overload the query
+    # Remove blocked DIDs from query, but only do the first 30 ones, not to overload the query
     if blocked_dids:
         chunk = list(chunks(blocked_dids, 30))[0]
         stmt = stmt.where(tuple_(models.UpdatedDID.scope, models.UpdatedDID.name).notin_(chunk))
@@ -2510,7 +2510,7 @@ def update_rules_for_lost_replica(
                    'name': name,
                    'dataset_name': dts['name'],
                    'dataset_scope': dts['scope'].external}
-        if scope.vo != 'def':
+        if scope.vo != DEFAULT_VO:
             message['vo'] = scope.vo
 
         add_message('LOST', message, session=session)
@@ -2675,7 +2675,7 @@ def generate_rule_notifications(
             payload = {'scope': rule.scope.external,
                        'name': rule.name,
                        'rule_id': rule.id}
-            if rule.scope.vo != 'def':
+            if rule.scope.vo != DEFAULT_VO:
                 payload['vo'] = rule.scope.vo
 
             add_message(event_type='RULE_OK', payload=payload, session=session)
@@ -2687,7 +2687,7 @@ def generate_rule_notifications(
                     payload = {'scope': rule.scope.external,
                                'name': rule.name,
                                'rule_id': rule.id}
-                    if rule.scope.vo != 'def':
+                    if rule.scope.vo != DEFAULT_VO:
                         payload['vo'] = rule.scope.vo
 
                     add_message(event_type='RULE_OK', payload=payload, session=session)
@@ -2697,7 +2697,7 @@ def generate_rule_notifications(
                                    'name': rule.name,
                                    'rule_id': rule.id,
                                    'progress': __progress_class(rule.locks_replicating_cnt, total_locks)}
-                        if rule.scope.vo != 'def':
+                        if rule.scope.vo != DEFAULT_VO:
                             payload['vo'] = rule.scope.vo
 
                         add_message(event_type='RULE_PROGRESS', payload=payload, session=session)
@@ -2721,7 +2721,7 @@ def generate_rule_notifications(
                                'rse': get_rse_name(rse_id=dataset_lock.rse_id, session=session),
                                'rse_id': dataset_lock.rse_id,
                                'rule_id': rule.id}
-                    if dataset_lock.scope.vo != 'def':
+                    if dataset_lock.scope.vo != DEFAULT_VO:
                         payload['vo'] = dataset_lock.scope.vo
 
                     add_message(event_type='DATASETLOCK_OK', payload=payload, session=session)
@@ -2745,7 +2745,7 @@ def generate_rule_notifications(
                                            'rse': get_rse_name(rse_id=dataset_lock.rse_id, session=session),
                                            'rse_id': dataset_lock.rse_id,
                                            'rule_id': rule.id}
-                                if dataset_lock.scope.vo != 'def':
+                                if dataset_lock.scope.vo != DEFAULT_VO:
                                     payload['vo'] = dataset_lock.scope.vo
 
                                 add_message(event_type='DATASETLOCK_OK', payload=payload, session=session)
@@ -2763,7 +2763,7 @@ def generate_rule_notifications(
                                'name': rule.name,
                                'rule_id': rule.id,
                                'progress': __progress_class(rule.locks_replicating_cnt, total_locks)}
-                    if rule.scope.vo != 'def':
+                    if rule.scope.vo != DEFAULT_VO:
                         payload['vo'] = rule.scope.vo
 
                     add_message(event_type='RULE_PROGRESS', payload=payload, session=session)
@@ -3403,9 +3403,9 @@ def __evaluate_did_detach(
     logger: LoggerFunction = logging.log
 ) -> None:
     """
-    Evaluate a parent did which has children removed.
+    Evaluate a parent DID which has children removed.
 
-    :param eval_did:  The did object in use.
+    :param eval_did:  The DID object in use.
     :param session:   The database session in use.
     :param logger:    Optional decorated logger that can be passed from the calling daemons or servers.
     """
@@ -3563,9 +3563,9 @@ def __evaluate_did_attach(
     logger: LoggerFunction = logging.log
 ) -> None:
     """
-    Evaluate a parent did which has new children
+    Evaluate a parent DID which has new children
 
-    :param eval_did:  The did object in use.
+    :param eval_did:  The DID object in use.
     :param session:   The database session in use.
     :param logger:    Optional decorated logger that can be passed from the calling daemons or servers.
     :raises:          ReplicationRuleCreationTemporaryFailed
@@ -3793,7 +3793,7 @@ def __evaluate_did_attach(
                         # Insert rule history
                         insert_rule_history(rule=rule, recent=True, longterm=False, session=session)
 
-            # Unflage the dids
+            # Unflag the DIDs
             with METRICS.timer('evaluate_did_attach.update_did'):
                 for did in new_child_dids:
                     did.rule_evaluation = None
@@ -3815,9 +3815,9 @@ def __resolve_did_to_locks_and_replicas(
            dict[tuple[str, str], models.RSEFileAssociation],
            dict[tuple[str, str], str]]:
     """
-    Resolves a did to its constituent children and reads the locks and replicas of all the constituent files.
+    Resolves a DID to its constituent children and reads the locks and replicas of all the constituent files.
 
-    :param did:            The db object of the did the rule is applied on.
+    :param did:            The db object of the DID the rule is applied on.
     :param nowait:         Nowait parameter for the FOR UPDATE statement.
     :param restrict_rses:  Possible rses of the rule, so only these replica/locks should be considered.
     :param source_rses:    Source rses for this rule. These replicas are not row-locked.
@@ -3922,7 +3922,7 @@ def __resolve_dids_to_locks_and_replicas(
            dict[tuple[str, str], models.RSEFileAssociation],
            dict[tuple[str, str], str]]:
     """
-    Resolves a list of dids to its constituent children and reads the locks and replicas of all the constituent files.
+    Resolves a list of DIDs to its constituent children and reads the locks and replicas of all the constituent files.
 
     :param dids:           The list of DataIdentifierAssociation objects.
     :param nowait:         Nowait parameter for the FOR UPDATE statement.
@@ -3940,7 +3940,7 @@ def __resolve_dids_to_locks_and_replicas(
     restrict_rses = restrict_rses or []
 
     if dids[0].child_type == DIDType.FILE:
-        # All the dids will be files!
+        # All the DIDs will be files!
         # Prepare the datasetfiles
         files = []
         for did in dids:

rucio/core/rule_grouping.py

@@ -1317,9 +1317,9 @@ def __set_replica_unavailable(replica, *, session: "Session"):
 @transactional_session
 def apply_rule(did, rule, rses, source_rses, rseselector, *, session: "Session", logger=logging.log):
     """
-    Apply a replication rule to one did.
+    Apply a replication rule to one DID.
 
-    :param did:          the did object
+    :param did:          the DID object
     :param rule:         the rule object
     :param rses:         target rses_ids
     :param source_rses:  source rses_ids
@@ -1616,4 +1616,3 @@ def apply_rule(did, rule, rses, source_rses, rseselector, *, session: "Session",
     for rse_id in account_counters_files:
         account_counter.increase(rse_id=rse_id, account=rule.account, files=account_counters_files[rse_id], bytes_=account_counters_bytes[rse_id], session=session)
     session.flush()
-

rucio/core/scope.py

@@ -65,7 +65,7 @@ def add_scope(scope, account, *, session: "Session"):
             raise Duplicate('Scope \'%s\' already exists!' % scope)
         else:
             raise RucioException(e)
-    except:
+    except Exception:
         raise RucioException(str(format_exc()))
 
 

rucio/core/trace.py

@@ -71,7 +71,7 @@ ROTATING_LOGGER.addHandler(ROTATING_HANDLER)
 BROKERS_ALIAS, BROKERS_RESOLVED = [], []
 try:
     BROKERS_ALIAS = config_get_list('trace', 'brokers')
-except:
+except Exception:
     raise Exception('Could not load brokers from configuration')
 
 PORT = config_get_int('trace', 'port')
@@ -285,7 +285,7 @@ for broker in BROKERS_ALIAS:
     try:
         addrinfos = socket.getaddrinfo(broker, 0, socket.AF_INET, 0, socket.IPPROTO_TCP)
         BROKERS_RESOLVED = [ai[4][0] for ai in addrinfos]
-    except:
+    except Exception:
         pass
 
 CONNS = []

rucio/core/transfer.py

@@ -28,7 +28,7 @@ from sqlalchemy import select, update
 from sqlalchemy.exc import IntegrityError
 
 from rucio.common.config import config_get, config_get_list
-from rucio.common.constants import SUPPORTED_PROTOCOLS, RseAttr, TransferLimitDirection
+from rucio.common.constants import DEFAULT_VO, SUPPORTED_PROTOCOLS, RseAttr, TransferLimitDirection
 from rucio.common.exception import InvalidRSEExpression, RequestNotFound, RSEProtocolNotSupported, RucioException, UnsupportedOperation
 from rucio.common.utils import construct_non_deterministic_pfn, get_transfer_schemas
 from rucio.core import did
@@ -485,7 +485,7 @@ def set_transfers_state(
                    'external-host': external_host,
                    'queued_at': str(submitted_at),
                    'datatype': datatype}
-            if rws.scope.vo != 'def':
+            if rws.scope.vo != DEFAULT_VO:
                 msg['vo'] = rws.scope.vo
 
             ds_scope = transfer.rws.attributes.get('ds_scope')

rucio/core/vo.py

@@ -20,6 +20,7 @@ from sqlalchemy.exc import DatabaseError, IntegrityError, NoResultFound
 
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.types import InternalAccount
 from rucio.db.sqla import models
 from rucio.db.sqla.constants import AccountType, IdentityType
@@ -88,7 +89,7 @@ def add_vo(vo: str, description: str, email: str, *, session: "Session") -> None
                          password='password',  # noqa: S106
                          session=session)
 
-    for ident in list_identities(account=InternalAccount('super_root', vo='def'), session=session):
+    for ident in list_identities(account=InternalAccount('super_root', vo=DEFAULT_VO), session=session):
         add_account_identity(identity=ident['identity'], type_=ident['type'], account=new_root, email='', session=session)
 
 

rucio/daemons/atropos/atropos.py

@@ -24,6 +24,7 @@ from typing import TYPE_CHECKING
 import rucio.core.lifetime_exception
 import rucio.db.sqla.util
 from rucio.common import exception
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import InvalidRSEExpression, RuleNotFound
 from rucio.common.logging import setup_logging
 from rucio.core.did import set_metadata
@@ -193,7 +194,7 @@ def run_once(
             tot_size += summary[rse_id][did].get('bytes', 0)
         vo = get_rse_vo(rse_id=rse_id)
         logger(logging.INFO, 'For RSE %s%s %d datasets will be deleted representing %d files and %d bytes',
-               get_rse_name(rse_id=rse_id), '' if vo == 'def' else ' on VO ' + vo, tot_datasets, tot_files, tot_size)
+               get_rse_name(rse_id=rse_id), '' if vo == DEFAULT_VO else ' on VO ' + vo, tot_datasets, tot_files, tot_size)
 
 
 def run(

rucio/daemons/auditor/__init__.py

@@ -247,7 +247,7 @@ def check(
                                  results_dir)
             if output:
                 process_output(output)
-        except:
+        except Exception:
             elapsed = (datetime.now() - start).total_seconds() / 60
             logger.error('Check of "%s" failed in %d minutes, %d remaining attempts', rse, elapsed, attempts, exc_info=True)
             success = False

rucio/daemons/automatix/automatix.py

@@ -31,7 +31,7 @@ from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_get_list
 from rucio.common.logging import setup_logging
 from rucio.common.stopwatch import Stopwatch
-from rucio.common.types import InternalScope, LoggerFunction
+from rucio.common.types import FileToUploadDict, InternalScope, LoggerFunction
 from rucio.common.utils import execute, generate_uuid
 from rucio.core.monitor import MetricManager
 from rucio.core.scope import list_scopes
@@ -214,7 +214,7 @@ def run_once(heartbeat_handler: HeartbeatHandler, inputfile: str, **_kwargs) ->
         fnames = []
         lfns = []
         physical_fnames = []
-        files = []
+        items: list[FileToUploadDict] = []
         for _ in range(nbfiles):
             fname = generate_didname(metadata=metadata, dsn=dsn, did_type="file")
             lfns.append(fname)
@@ -223,7 +223,7 @@ def run_once(heartbeat_handler: HeartbeatHandler, inputfile: str, **_kwargs) ->
             physical_fnames.append(physical_fname)
             generate_file(physical_fname, filesize, logger=logger)
             fnames.append(fname)
-            file_ = {
+            file_: FileToUploadDict = {
                 "did_scope": scope,
                 "did_name": fname,
                 "dataset_scope": scope,
@@ -235,11 +235,11 @@ def run_once(heartbeat_handler: HeartbeatHandler, inputfile: str, **_kwargs) ->
                 file_["dataset_meta"] = metadata
                 if dataset_lifetime:
                     file_["dataset_meta"]["lifetime"] = dataset_lifetime
-            files.append(file_)
+            items.append(file_)
         logger(logging.INFO, "Upload %s:%s to %s", scope, dsn, rse)
         try:
             upload_client = UploadClient(client)
-            ret = upload_client.upload(files)
+            ret = upload_client.upload(items=items)
             if ret == 0:
                 logger(logging.INFO, "%s successfully registered on %s", dsn, rse)
                 METRICS.counter(name="addnewdataset.done").inc()

rucio/daemons/badreplicas/minos.py

@@ -24,6 +24,7 @@ from sqlalchemy.exc import DatabaseError
 
 import rucio.db.sqla.util
 from rucio.common.config import config_get_int
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import DatabaseException, DataIdentifierNotFound, ReplicaNotFound, UnsupportedOperation
 from rucio.common.logging import setup_logging
 from rucio.common.utils import chunks
@@ -31,7 +32,7 @@ from rucio.core.did import get_metadata
 from rucio.core.replica import bulk_add_bad_replicas, bulk_delete_bad_pfns, declare_bad_file_replicas, get_bad_pfns, get_did_from_pfns, get_pfn_to_rse, get_replicas_state, update_replicas_states
 from rucio.core.rse import get_rse_name
 from rucio.daemons.common import run_daemon
-from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, BadFilesStatus, BadPFNStatus, ReplicaState
+from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, BadFilesStatus, BadPFNStatus, ReplicaState
 from rucio.db.sqla.session import get_session
 
 if TYPE_CHECKING:
@@ -208,7 +209,7 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
             dict_rse = __clean_unknown_replicas(pfns, vo, logger)
             for rse_id, pfns_by_scheme in dict_rse.items():
                 rse = get_rse_name(rse_id=rse_id, session=None)
-                rse_vo_str = rse if vo == 'def' else '{} on VO {}'.format(rse, vo)
+                rse_vo_str = rse if vo == DEFAULT_VO else '{} on VO {}'.format(rse, vo)
                 for scheme, pfns in pfns_by_scheme.items():
                     logger(logging.DEBUG, 'Running on RSE %s with %s replicas', rse_vo_str, len(pfns))
                     tot_chunk = int(math.ceil(len(pfns) / chunk_size))
@@ -220,7 +221,10 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
                         bulk_delete_bad_pfns(pfns=chunk, session=session)
                         session.commit()  # pylint: disable=no-member
         except (DatabaseException, DatabaseError) as error:
-            if re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0]) or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0]) or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]:
+            if (re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0])
+                    or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0])
+                    or re.match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(error.args[0]))
+                    or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]):
                 logger(logging.WARNING, 'Lock detected when handling request - skipping: %s', str(error))
             else:
                 logger(logging.ERROR, 'Exception', exc_info=True)
@@ -242,7 +246,7 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
         for rse_id in dict_rse:
             replicas = []
             rse = get_rse_name(rse_id=rse_id, session=None)
-            rse_vo_str = rse if vo == 'def' else '{} on VO {}'.format(rse, vo)
+            rse_vo_str = rse if vo == DEFAULT_VO else '{} on VO {}'.format(rse, vo)
             logger(logging.DEBUG, 'Running on RSE %s', rse_vo_str)
             for rse_id, pfns_by_scheme in dict_rse.items():
                 for scheme, pfns in pfns_by_scheme.items():
@@ -273,7 +277,10 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
                     __update_temporary_unavailable(chunk=chunk, reason=reason, expires_at=expires_at, account=account, logger=logger)
                     session = get_session()
                 except (DatabaseException, DatabaseError) as error:
-                    if re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0]) or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0]) or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]:
+                    if (re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0])
+                            or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0])
+                            or re.match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(error.args[0]))
+                            or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]):
                         logger(logging.WARNING, 'Lock detected when handling request - skipping: %s', str(error))
                     else:
                         logger(logging.ERROR, 'Exception', exc_info=True)

rucio/daemons/badreplicas/minos_temporary_expiration.py

@@ -30,7 +30,7 @@ from rucio.common.utils import chunks
 from rucio.core.did import get_metadata
 from rucio.core.replica import bulk_delete_bad_replicas, get_replicas_state, list_expired_temporary_unavailable_replicas, update_replicas_states
 from rucio.daemons.common import run_daemon
-from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, BadFilesStatus, ReplicaState
+from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, BadFilesStatus, ReplicaState
 from rucio.db.sqla.session import get_session
 
 if TYPE_CHECKING:
@@ -127,7 +127,10 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
                     session.commit()  # pylint: disable=no-member
             session = get_session()
         except (DatabaseException, DatabaseError) as error:
-            if re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0]) or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0]) or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]:
+            if (re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0])
+                    or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0])
+                    or re.match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(error.args[0]))
+                    or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]):
                 logger(logging.WARNING, 'Lock detected when handling request - skipping: %s', str(error))
             else:
                 logger(logging.ERROR, 'Exception', exc_info=True)

rucio/daemons/badreplicas/necromancer.py

@@ -33,7 +33,7 @@ from rucio.core.monitor import MetricManager
 from rucio.core.replica import get_bad_replicas_backlog, get_replicas_state, list_bad_replicas
 from rucio.core.rule import get_evaluation_backlog, update_rules_for_bad_replica, update_rules_for_lost_replica
 from rucio.daemons.common import HeartbeatHandler, run_daemon
-from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, ReplicaState
+from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, ReplicaState
 
 if TYPE_CHECKING:
     from types import FrameType
@@ -136,7 +136,10 @@ def run_once(heartbeat_handler: HeartbeatHandler, bulk: int, **_kwargs) -> bool:
                         update_rules_for_lost_replica(scope=scope, name=name, rse_id=rse_id, nowait=True)
                         METRICS.counter(name='badfiles.lostfile').inc()
                     except (DatabaseException, DatabaseError) as error:
-                        if re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0]) or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0]) or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]:
+                        if (re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0])
+                                or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0])
+                                or re.match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(error.args[0]))
+                                or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]):
                             logger(logging.WARNING, 'Lock detected when handling request - skipping: %s', str(error))
                         else:
                             logger(logging.ERROR, str(error))
@@ -149,7 +152,10 @@ def run_once(heartbeat_handler: HeartbeatHandler, bulk: int, **_kwargs) -> bool:
                         update_rules_for_bad_replica(scope=scope, name=name, rse_id=rse_id, nowait=True)
                         METRICS.counter(name='badfiles.recovering').inc()
                     except (DatabaseException, DatabaseError) as error:
-                        if re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0]) or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0]) or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]:
+                        if (re.match(ORACLE_RESOURCE_BUSY_REGEX, error.args[0])
+                                or re.match(ORACLE_DEADLOCK_DETECTED_REGEX, error.args[0])
+                                or re.match(PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX, str(error.args[0]))
+                                or MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED in error.args[0]):
                             logger(logging.WARNING, 'Lock detected when handling request - skipping: %s', str(error))
                         else:
                             logger(logging.ERROR, str(error))

rucio/daemons/bb8/bb8.py

@@ -23,6 +23,7 @@ import threading
 from typing import TYPE_CHECKING, Optional
 
 from rucio.common.config import config_get_float
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import InvalidRSEExpression
 from rucio.common.logging import setup_logging
 from rucio.core.heartbeat import list_payload_counts, sanity_check
@@ -252,7 +253,7 @@ def run_once(
                 if available_source_rebalance_volume > 0:
                     vo_str = (
                         " on VO {}".format(destination_rse["vo"])
-                        if destination_rse["vo"] != "def"
+                        if destination_rse["vo"] != DEFAULT_VO
                         else ""
                     )
                     if index == 0 and destination_rse["id"] in dict_locks:

rucio/daemons/bb8/common.py

@@ -279,7 +279,7 @@ def list_rebalance_rule_candidates(
 
     vo = get_rse_vo(rse_id=rse_id)
 
-    # dumps can be applied only for decommission since the dumps doesn't contain info from dids
+    # dumps can be applied only for decommission since the dumps doesn't contain info from DIDs
     if mode == "decommission":
         return _list_rebalance_rule_candidates_dump(rse_id, mode)