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

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/badreplicas/minos.py

@@ -31,7 +31,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:
@@ -220,7 +220,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)
@@ -273,7 +276,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/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)
 

rucio/daemons/bb8/nuclei_background_rebalance.py

@@ -43,7 +43,7 @@ def group_space(site: str) -> int:
     group_total = 0
     try:
         site_groupdisks = parse_expression('site=%s&spacetoken=ATLASDATADISK&type=GROUPDISK' % site)
-    except:
+    except Exception:
         return group_total
 
     for rse in site_groupdisks:

rucio/daemons/bb8/t2_background_rebalance.py

@@ -43,7 +43,7 @@ def group_space(site: str) -> int:
     group_total = 0
     try:
         site_groupdisks = parse_expression('site=%s&spacetoken=ATLASDATADISK&type=GROUPDISK' % site)
-    except:
+    except Exception:
         return group_total
 
     for rse in site_groupdisks:

rucio/daemons/cache/consumer.py

@@ -103,7 +103,7 @@ class AMQConsumer:
             else:
                 self.__logger(logging.DEBUG, 'Check failed: %s %s '
                               % (isinstance(msg, dict), 'operation' in msg.keys()))
-        except:
+        except Exception:
             self.__logger(logging.ERROR, str(format_exc()))
 
 

rucio/daemons/conveyor/finisher.py

@@ -43,7 +43,7 @@ from rucio.core.rse import list_rses
 from rucio.core.topology import ExpiringObjectCache, Topology
 from rucio.core.transfer import ProtocolFactory
 from rucio.daemons.common import ProducerConsumerDaemon, db_workqueue
-from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, BadFilesStatus, ReplicaState, RequestState, RequestType
+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, RequestState, RequestType
 from rucio.db.sqla.session import transactional_session
 
 if TYPE_CHECKING:
@@ -140,7 +140,10 @@ def _handle_requests(
         logger(logging.DEBUG, 'Finish to update %s finished requests in %s seconds', len(reqs), total_stopwatch.elapsed)
 
     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:
             raise
@@ -421,14 +424,20 @@ def __handle_terminated_replicas(
                     try:
                         __update_replica(replica, logger=logger)
                     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, "Locks detected when handling replica %s:%s at RSE %s", replica['scope'], replica['name'], replica['rse_id'])
                         else:
                             logger(logging.ERROR, "Could not finish handling replicas %s:%s at RSE %s", replica['scope'], replica['name'], replica['rse_id'], exc_info=True)
                     except Exception as error:
                         logger(logging.ERROR, "Something unexpected happened when updating replica state for transfer %s:%s at %s (%s)", replica['scope'], replica['name'], replica['rse_id'], str(error))
             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, "Locks detected when handling replicas on %s rule %s, update updated time.", req_type, rule_id)
                     try:
                         request_core.touch_requests_by_rule(rule_id)

rucio/daemons/conveyor/poller.py

@@ -40,7 +40,7 @@ from rucio.core import transfer as transfer_core
 from rucio.core.monitor import MetricManager
 from rucio.core.topology import ExpiringObjectCache, Topology
 from rucio.daemons.common import ProducerConsumerDaemon, db_workqueue
-from rucio.db.sqla.constants import MYSQL_LOCK_WAIT_TIMEOUT_EXCEEDED, ORACLE_DEADLOCK_DETECTED_REGEX, ORACLE_RESOURCE_BUSY_REGEX, RequestState, RequestType
+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, RequestState, RequestType
 from rucio.transfertool.fts3 import FTS3Transfertool
 
 if TYPE_CHECKING:
@@ -387,7 +387,10 @@ def _poll_transfers(
             # Otherwise if one bulk transfer includes many requests and one is not terminated, the transfer will be poll again.
             transfer_core.touch_transfer(transfertool_obj.external_host, transfer_id)
         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 %s - skipping" % transfer_id)
             else:
                 logger(logging.ERROR, 'Exception', exc_info=True)

rucio/daemons/conveyor/receiver.py

@@ -151,7 +151,7 @@ def receiver(
     use_ssl = True
     try:
         use_ssl = config_get_bool('messaging-fts3', 'use_ssl')
-    except:
+    except Exception:
         logging.info('could not find use_ssl in configuration -- please update your rucio.cfg')
 
     port = config_get_int('messaging-fts3', 'port')

rucio/daemons/follower/follower.py

@@ -38,7 +38,7 @@ def aggregate_events(
         once: bool = False
 ) -> None:
     """
-    Collect all the events affecting the dids followed by the corresponding account.
+    Collect all the events affecting the DIDs followed by the corresponding account.
     """
 
     logging.info('event_aggregation: started')

rucio/daemons/hermes/hermes.py

@@ -115,7 +115,7 @@ def setup_activemq(
     brokers_resolved = []
     try:
         brokers_alias = config_get_list("messaging-hermes", "brokers")
-    except:
+    except Exception:
         raise Exception("Could not load brokers from configuration")
 
     logger(logging.INFO, "[broker] Resolving broker dns alias: %s", brokers_alias)
@@ -148,7 +148,7 @@ def setup_activemq(
     use_ssl = True
     try:
         use_ssl = config_get_bool("messaging-hermes", "use_ssl")
-    except:
+    except Exception:
         logger(
             logging.INFO,
             "[broker] Could not find use_ssl in configuration -- please update your rucio.cfg",

rucio/daemons/judge/cleaner.py

@@ -34,7 +34,7 @@ from rucio.common.logging import setup_logging
 from rucio.core.monitor import MetricManager
 from rucio.core.rule import delete_rule, get_expired_rules
 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
 from rucio.db.sqla.util import get_db_time
 
 if TYPE_CHECKING:
@@ -103,7 +103,7 @@ def run_once(
             delete_rule(rule_id=rule_id, nowait=True)
             logger(logging.DEBUG, 'deletion of %s took %f' % (rule_id, time.time() - start))
         except (DatabaseException, DatabaseError, UnsupportedOperation) 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
                 METRICS.counter('exceptions.{exception}').labels(exception='LocksDetected').inc()
                 logger(logging.WARNING, 'Locks detected for %s' % rule_id)

rucio/daemons/judge/evaluator.py

@@ -36,7 +36,7 @@ from rucio.common.types import InternalScope
 from rucio.core.monitor import MetricManager
 from rucio.core.rule import delete_updated_did, get_updated_dids, re_evaluate_did
 from rucio.daemons.common import HeartbeatHandler, run_daemon
-from rucio.db.sqla.constants import ORACLE_CONNECTION_LOST_CONTACT_REGEX, ORACLE_RESOURCE_BUSY_REGEX, ORACLE_UNIQUE_CONSTRAINT_VIOLATED_REGEX
+from rucio.db.sqla.constants import MYSQL_LOCK_NOWAIT_REGEX, ORACLE_CONNECTION_LOST_CONTACT_REGEX, ORACLE_RESOURCE_BUSY_REGEX, ORACLE_UNIQUE_CONSTRAINT_VIOLATED_REGEX, PSQL_PSYCOPG_LOCK_NOT_AVAILABLE_REGEX
 
 if TYPE_CHECKING:
     from types import FrameType
@@ -52,7 +52,7 @@ def re_evaluator(
         did_limit: int = 100
 ) -> None:
     """
-    Main loop to check the re-evaluation of dids.
+    Main loop to check the re-evaluation of DIDs.
     """
 
     paused_dids = {}  # {(scope, name): datetime}
@@ -81,13 +81,13 @@ def run_once(
     # heartbeat
     start = time.time()  # NOQA
 
-    # Refresh paused dids
+    # Refresh paused DIDs
     iter_paused_dids = copy.copy(paused_dids)
     for key in iter_paused_dids:
         if datetime.utcnow() > paused_dids[key]:
             del paused_dids[key]
 
-    # Select a bunch of dids for re evaluation for this worker
+    # Select a bunch of DIDs for re-evaluation for this worker
     dids = get_updated_dids(total_workers=total_workers,
                             worker_number=worker_number,
                             limit=did_limit,
@@ -106,7 +106,7 @@ def run_once(
         if graceful_stop.is_set():
             break
 
-        # Check if this did has already been operated on
+        # Check if this DID has already been operated on
         did_tag = '%s:%s' % (did.scope.internal, did.name)
         if did_tag in done_dids:
             if did.rule_evaluation_action in done_dids[did_tag]:
@@ -116,7 +116,7 @@ def run_once(
         else:
             done_dids[did_tag] = []
 
-        # Jump paused dids
+        # Jump paused DIDs
         if (did.scope.internal, did.name) in paused_dids:
             continue
 
@@ -129,7 +129,7 @@ def run_once(
         except DataIdentifierNotFound:
             delete_updated_did(id_=did.id)
         except (DatabaseException, DatabaseError) as e:
-            if match(ORACLE_UNIQUE_CONSTRAINT_VIOLATED_REGEX, str(e.args[0])) or match(ORACLE_RESOURCE_BUSY_REGEX, str(e.args[0])):
+            if match(ORACLE_UNIQUE_CONSTRAINT_VIOLATED_REGEX, str(e.args[0])) or 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_dids[(did.scope.internal, did.name)] = datetime.utcnow() + timedelta(seconds=randint(60, 600))  # noqa: S311
                 logger(logging.WARNING, 'Locks detected for %s:%s', did.scope, did.name)
                 METRICS.counter('exceptions.{exception}').labels(exception='LocksDetected').inc()

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/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

@@ -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: