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

rucio/daemons/bb8/nuclei_background_rebalance.py

@@ -18,7 +18,7 @@ This script is to be used to background rebalance ATLAS t2 datadisks
 
 from sqlalchemy import and_, or_, select
 
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.core.rse import get_rse_attribute, get_rse_usage
 from rucio.core.rse_expression_parser import parse_expression
 from rucio.daemons.bb8.common import rebalance_rse
@@ -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:
@@ -143,7 +143,7 @@ for source_rse in rses_over_ratio:
             if available_target_rebalance_volume >= available_source_rebalance_volume:
                 available_target_rebalance_volume = available_source_rebalance_volume
 
-            vo_str = 'on VO {}'.format(destination_rse['vo']) if destination_rse['vo'] != 'def' else 'def'
+            vo_str = 'on VO {}'.format(destination_rse['vo']) if destination_rse['vo'] != DEFAULT_VO else DEFAULT_VO
             print('Rebalance %dTB from %s(%f) to %s(%f)%s' % (available_target_rebalance_volume / 1E12, source_rse['rse'], source_rse['ratio'], destination_rse['rse'], destination_rse['ratio'], vo_str))
             expr = destination_rse['rse']
             rebalance_rse(rse_id=source_rse['id'], max_bytes=available_target_rebalance_volume, dry_run=False, comment='Nuclei Background rebalancing', force_expression=expr)

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/common.py

@@ -24,7 +24,7 @@ import re
 from typing import TYPE_CHECKING, Any, Optional
 
 from rucio.common.config import config_get_bool
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import DatabaseException, DuplicateFileTransferSubmission, InvalidRSEExpression, RequestNotFound, TransferToolTimeout, TransferToolWrongAnswer, VONotFound
 from rucio.common.stopwatch import Stopwatch
 from rucio.core import request as request_core
@@ -510,7 +510,7 @@ def get_conveyor_rses(
     :param include_rses:  RSEs to include
     :param exclude_rses:  RSEs to exclude
     :param vos:           VOs on which to look for RSEs. Only used in multi-VO mode.
-                          If None, we either use all VOs if run from "def", or the current VO otherwise.
+                          If None, we either use all VOs if run from DEFAULT_VO, or the current VO otherwise.
     :param logger:        Optional decorated logger that can be passed from the calling daemons or servers.
     :return:              List of working rses
     """
@@ -518,7 +518,7 @@ def get_conveyor_rses(
     if not multi_vo:
         if vos:
             logger(logging.WARNING, 'Ignoring argument vos, this is only applicable in a multi-VO setup.')
-        vos = ['def']
+        vos = [DEFAULT_VO]
     else:
         if vos:
             invalid = set(vos) - set([v['vo'] for v in list_vos()])

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/conveyor/submitter.py

@@ -22,6 +22,7 @@ from typing import TYPE_CHECKING, Optional
 import rucio.db.sqla.util
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_float, config_get_int, config_get_list
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.logging import setup_logging
 from rucio.common.schema import get_schema_value
 from rucio.common.stopwatch import Stopwatch
@@ -370,7 +371,7 @@ def run(
     if exclude_activities:
         if not activities:
             if not multi_vo:
-                vos = ['def']
+                vos = [DEFAULT_VO]
             if vos and len(vos) == 1:
                 activities = get_schema_value('ACTIVITY', vos[0])
             elif vos and len(vos) > 1:

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

@@ -25,6 +25,7 @@ import random
 import re
 import smtplib
 import socket
+import ssl
 import sys
 import threading
 import time
@@ -115,7 +116,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 +149,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",
@@ -343,6 +344,14 @@ def deliver_emails(
     :returns:                  List of message_id to delete
     """
 
+    smtp_host = config_get("messaging-hermes", "smtp_host")
+    smtp_port = config_get_int("messaging-hermes", "smtp_port", default=25)
+    smtp_username = config_get("messaging-hermes", "smtp_username", default='')
+    smtp_password = config_get("messaging-hermes", "smtp_password", default='')
+    smtp_certfile = config_get("messaging-hermes", "smtp_certfile", default='')
+    smtp_keyfile = config_get("messaging-hermes", "smtp_keyfile", default='')
+    smtp_usessl = config_get_bool("messaging-hermes", "smtp_usessl", default=False)
+    smtp_usetls = config_get_bool("messaging-hermes", "smtp_usetls", default=False)
     email_from = config_get("messaging-hermes", "email_from")
     send_email = config_get_bool(
         "messaging-hermes", "send_email", raise_exception=False, default=True
@@ -357,12 +366,24 @@ def deliver_emails(
 
             try:
                 if send_email:
-                    smtp = smtplib.SMTP()
-                    smtp.connect()
-                    smtp.sendmail(
-                        msg["From"], message["payload"]["to"], msg.as_string()
-                    )
-                    smtp.quit()
+                    ssl_context = None
+                    if smtp_certfile and smtp_keyfile:
+                        ssl_context = ssl.create_default_context()
+                        ssl_context.load_cert_chain(certfile=smtp_certfile, keyfile=smtp_keyfile)
+
+                    smtp_context = smtplib.SMTP(host=smtp_host, port=smtp_port)
+                    if not smtp_usetls and smtp_usessl:
+                        smtp_context = smtplib.SMTP_SSL(host=smtp_host, port=smtp_port, context=ssl_context)
+
+                    with smtp_context as smtp_server:
+                        if smtp_usetls:
+                            smtp_server.ehlo()  # not strictly necessary
+                            smtp_server.starttls(context=ssl_context)
+                        if smtp_username and smtp_password:
+                            smtp_server.login(smtp_username, smtp_password)
+                        smtp_server.sendmail(
+                            msg["From"], message["payload"]["to"], msg.as_string()
+                        )
                 to_delete.append(message["id"])
             except Exception as error:
                 logger(logging.ERROR, "Cannot send email : %s", str(error))

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/reaper/dark_reaper.py

@@ -29,6 +29,7 @@ import rucio.core.rse as rse_core
 import rucio.db.sqla.util
 from rucio.common import exception
 from rucio.common.config import config_get_bool
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import ResourceTemporaryUnavailable, RSEAccessDenied, RSENotFound, ServiceUnavailable, SourceNotFound, VONotFound
 from rucio.common.logging import setup_logging
 from rucio.core.message import add_message
@@ -145,7 +146,7 @@ def run_once(
                                'url': pfn,
                                'duration': duration,
                                'protocol': prot.attributes['scheme']}
-                    if replica['scope'].vo != 'def':
+                    if replica['scope'].vo != DEFAULT_VO:
                         payload['vo'] = replica['scope'].vo
                     add_message('deletion-done', payload)
                     deleted_replicas.append(replica)
@@ -167,7 +168,7 @@ def run_once(
                                'url': pfn,
                                'reason': str(error),
                                'protocol': prot.attributes['scheme']}
-                    if replica['scope'].vo != 'def':
+                    if replica['scope'].vo != DEFAULT_VO:
                         payload['vo'] = replica['scope'].vo
                     add_message('deletion-failed', payload)
 
@@ -215,7 +216,7 @@ def run(
     :param exclude_rses: RSE expression to exclude RSEs from the Reaper.
     :param include_rses: RSE expression to include RSEs.
     :param vos: VOs on which to look for RSEs. Only used in multi-VO mode.
-                If None, we either use all VOs if run from "def", or the current VO otherwise.
+                If None, we either use all VOs if run from DEFAULT_VO, or the current VO otherwise.
     """
     rses = rses or []
     setup_logging(process_name=DAEMON_NAME)
@@ -229,7 +230,7 @@ def run(
     if not multi_vo:
         if vos:
             logging.warning('Ignoring argument vos, this is only applicable in a multi-VO setup.')
-        vos = ['def']
+        vos = [DEFAULT_VO]
     else:
         if vos:
             invalid = set(vos) - set([v['vo'] for v in list_vos()])

rucio/daemons/reaper/reaper.py

@@ -35,7 +35,7 @@ from sqlalchemy.exc import DatabaseError, IntegrityError
 import rucio.db.sqla.util
 from rucio.common.cache import MemcacheRegion
 from rucio.common.config import config_get_bool, config_get_int
-from rucio.common.constants import RseAttr
+from rucio.common.constants import RseAttr, DEFAULT_VO
 from rucio.common.exception import DatabaseException, ReplicaNotFound, ReplicaUnAvailable, ResourceTemporaryUnavailable, RSEAccessDenied, RSENotFound, RSEProtocolNotSupported, ServiceUnavailable, SourceNotFound, VONotFound
 from rucio.common.logging import setup_logging
 from rucio.common.stopwatch import Stopwatch
@@ -81,7 +81,7 @@ def get_rses_to_process(
     :param exclude_rses:       RSE expression to exclude RSEs from the Reaper.
     :param include_rses:       RSE expression to include RSEs.
     :param vos:                VOs on which to look for RSEs. Only used in multi-VO mode.
-                               If None, we either use all VOs if run from "def"
+                               If None, we either use all VOs if run from DEFAULT_VO
 
     :returns: A list of RSEs to process
     """
@@ -89,7 +89,7 @@ def get_rses_to_process(
     if not multi_vo:
         if vos:
             logging.log(logging.WARNING, 'Ignoring argument vos, this is only applicable in a multi-VO setup.')
-        vos = ['def']
+        vos = [DEFAULT_VO]
     else:
         if vos:
             invalid = set(vos) - set([v['vo'] for v in list_vos()])
@@ -156,7 +156,7 @@ def delete_from_storage(heartbeat_handler, hb_payload, replicas, prot, rse_info,
                              'protocol': prot.attributes['scheme'],
                              'datatype': replica['datatype']}
             try:
-                if replica['scope'].vo != 'def':
+                if replica['scope'].vo != DEFAULT_VO:
                     deletion_dict['vo'] = replica['scope'].vo
                 logger(logging.DEBUG, 'Deletion ATTEMPT of %s:%s as %s on %s', replica['scope'], replica['name'], replica['pfn'], rse_name)
                 # For STAGING RSEs, no physical deletion
@@ -232,7 +232,7 @@ def delete_from_storage(heartbeat_handler, hb_payload, replicas, prot, rse_info,
                        'url': replica['pfn'],
                        'reason': str(error),
                        'protocol': prot.attributes['scheme']}
-            if replica['scope'].vo != 'def':
+            if replica['scope'].vo != DEFAULT_VO:
                 payload['vo'] = replica['scope'].vo
             add_message('deletion-failed', payload)
         logger(logging.INFO, 'Cannot connect to %s. RSE will be temporarily excluded.', rse_name)
@@ -400,7 +400,7 @@ def reaper(
     :param include_rses:           RSE expression to include RSEs.
     :param exclude_rses:           RSE expression to exclude RSEs from the Reaper.
     :param vos:                    VOs on which to look for RSEs. Only used in multi-VO mode.
-                                   If None, we either use all VOs if run from "def", or the current VO otherwise.
+                                   If None, we either use all VOs if run from DEFAULT_VO, or the current VO otherwise.
     :param chunk_size:             The size of chunk for deletion.
     :param once:                   If True, only runs one iteration of the main loop.
     :param greedy:                 If True, delete right away replicas with tombstone.
@@ -703,7 +703,7 @@ def run(
     :param exclude_rses:           RSE expression to exclude RSEs from the Reaper.
     :param include_rses:           RSE expression to include RSEs.
     :param vos:                    VOs on which to look for RSEs. Only used in multi-VO mode.
-                                   If None, we either use all VOs if run from "def",
+                                   If None, we either use all VOs if run from DEFAULT_VO,
                                    or the current VO otherwise.
     :param delay_seconds:          The delay to query replicas in BEING_DELETED state.
     :param sleep_time:             Time between two cycles.

rucio/daemons/replicarecoverer/suspicious_replica_recoverer.py

@@ -31,7 +31,7 @@ from typing import TYPE_CHECKING, Any, Optional
 
 import rucio.db.sqla.util
 from rucio.common.config import config_get, config_get_bool
-from rucio.common.constants import SuspiciousAvailability
+from rucio.common.constants import DEFAULT_VO, SuspiciousAvailability
 from rucio.common.exception import DatabaseException, DuplicateRule, VONotFound
 from rucio.common.logging import setup_logging
 from rucio.common.types import InternalAccount, LoggerFunction
@@ -145,7 +145,7 @@ def declare_suspicious_replicas_bad(
     :param nattempts: The minimum number of appearances in the bad_replica DB table
                       in order to appear in the resulting list of replicas for recovery.
     :param vos: VOs on which to look for RSEs. Only used in multi-VO mode.
-                If empty, we either use all VOs if run from "def",
+                If empty, we either use all VOs if run from DEFAULT_VO,
     :param limit_suspicious_files_on_rse: Maximum number of suspicious replicas on an RSE before that RSE
                                           is considered problematic and the suspicious replicas on that RSE
                                           are labeled as 'TEMPORARY_UNAVAILABLE'.
@@ -182,7 +182,7 @@ def run_once(heartbeat_handler: Any, younger_than: int, nattempts: int, vos: "Op
     if not multi_vo:
         if vos:
             logger(logging.WARNING, 'Ignoring argument vos, this is only applicable in a multi-VO setup.')
-        vos = ['def']
+        vos = [DEFAULT_VO]
     else:
         if vos:
             invalid = set(vos) - set([v['vo'] for v in list_vos()])
@@ -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/tracer/kronos.py

@@ -30,6 +30,7 @@ from typing import TYPE_CHECKING, Optional
 
 import rucio.db.sqla.util
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_get_list
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import DatabaseException, RSENotFound
 from rucio.common.logging import setup_logging
 from rucio.common.stomp_utils import StompConnectionManager
@@ -143,7 +144,7 @@ class AMQConsumer:
         rses = []
         for report in self.__reports:
             if 'vo' not in report:
-                report['vo'] = 'def'
+                report['vo'] = DEFAULT_VO
 
             try:
                 # Identify suspicious files
@@ -299,7 +300,7 @@ class AMQConsumer:
                                 'usrdn': 'someuser',
                                 'clientState': 'DONE',
                                 'eventVersion': replica['eventVersion']}
-                    if replica['scope'].vo != 'def':
+                    if replica['scope'].vo != DEFAULT_VO:
                         resubmit['vo'] = replica['scope'].vo
                     self.__conn.send(body=jdumps(resubmit), destination=self.__queue, headers={'appversion': 'rucio', 'resubmitted': '1'})
                     METRICS.counter('sent_resubmitted').inc()