rucio 38.0.0rc3__tar.gz → 38.2.0__tar.gz

{rucio-38.0.0rc3 → rucio-38.2.0}/AUTHORS.rst

@@ -69,6 +69,7 @@ Individual contributors to the source code
 - Maximilian Linhoff, <maximilian.linhoff@tu-dortmund.de>, 2024
 - Eric Banzuzi, <eric.banzuzi@gmail.com>, 2024
 - Paul Millar, <paul.millar@desy.de>, 2025
+- Vimalan S <vimalan.github@gmail.com>, 2025
 
 Organisations employing contributors
 ------------------------------------

{rucio-38.0.0rc3 → rucio-38.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 38.0.0rc3
+Version: 38.2.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-38.0.0rc3 → rucio-38.2.0}/bin/rucio

@@ -17,6 +17,7 @@ import argparse
 import sys
 from typing import TYPE_CHECKING, Optional
 
+from rucio.cli.bin_legacy.rucio import get_parser
 from rucio.cli.bin_legacy.rucio import main as main_legacy
 from rucio.cli.command import main
 from rucio.common.utils import setup_logger
@@ -119,9 +120,11 @@ if __name__ == "__main__":
         main()  # pylint: disable=E1120
 
     else:
-        make_warning(logger)
         try:
+            get_parser().parse_args()
+            make_warning(logger)
             main_legacy()
+
         # Make a custom warning - show the new help menu when invalid commands are called.
         except argparse.ArgumentError:
             logger.error("Invalid argument(s) - %s " % sys.argv[1:])

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/cli/account.py

@@ -212,5 +212,5 @@ def identity_add(ctx, account_name, type_, id, email, password):
 @click.pass_context
 def identity_remove(ctx, account_name, type_, id):
     """Revoke a given ID's access from an account"""
-    args = Arguments({"no_pager": ctx.obj.no_pager, "account": account_name, "authtype": type_, "id": id})
+    args = Arguments({"no_pager": ctx.obj.no_pager, "account": account_name, "authtype": type_, "identity": id})
     identity_delete(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -32,7 +32,6 @@ from rich.status import Status
 from rich.text import Text
 from rich.theme import Theme
 from rich.traceback import install
-from rich.tree import Tree
 from tabulate import tabulate
 
 # rucio module has the same name as this executable module, so this rule fails. pylint: disable=no-name-in-module
@@ -716,64 +715,7 @@ def list_parent_dids(args, client, logger, console, spinner):
         spinner.update(status='Fetching parent DIDs')
         spinner.start()
 
-    if args.pfns:
-        dict_datasets = {}
-        output = []
-        for res in client.get_did_from_pfns(args.pfns):
-            for key in res:
-                if key not in dict_datasets:
-                    dict_datasets[key] = []
-                for rule in client.list_associated_rules_for_file(res[key]['scope'], res[key]['name']):
-                    if f"{rule['scope']}:{rule['name']}" not in dict_datasets[key]:
-                        dict_datasets[key].append(f"{rule['scope']}:{rule['name']}")
-
-        for i, pfn in enumerate(dict_datasets):
-            if cli_config == 'rich':
-                parent_tree = Tree('')
-                for parent in dict_datasets[pfn]:
-                    parent_tree.add(parent)
-                table = generate_table([['PFN', pfn], ['Parents', parent_tree]], col_alignments=['left', 'left'], row_styles=['none'])
-                output.append(table)
-            else:
-                print('PFN: ', pfn)
-                print('Parents: ', ','.join(dict_datasets[pfn]))
-
-        if cli_config == 'rich':
-            spinner.stop()
-            print_output(*output, console=console, no_pager=args.no_pager)
-    elif args.guids:
-        output = []
-        guids = []
-        for input_ in args.guids:
-            try:
-                uuid.UUID(input_)
-            except ValueError:
-                print(f'Ignoring invalid GUID: {input_}')
-                continue
-        dict_datasets = {}
-        for guid in guids:
-            for did in client.get_dataset_by_guid(guid):
-                if guid not in dict_datasets:
-                    dict_datasets[guid] = []
-                for rule in client.list_associated_rules_for_file(did['scope'], did['name']):
-                    if f"{rule['scope']}:{rule['name']}" not in dict_datasets[guid]:
-                        dict_datasets[guid].append(f"{rule['scope']}:{rule['name']}")
-
-        for i, guid in enumerate(dict_datasets):
-            if cli_config == 'rich':
-                parent_tree = Tree('')
-                for parent in dict_datasets[guid]:
-                    parent_tree.add(parent)
-                table = generate_table([['GUID', guid], ['Parents', parent_tree]], col_alignments=['left', 'left'], row_styles=['none'])
-                output.append(table)
-            else:
-                print('GUID: ', guid)
-                print('Parents : ', ','.join(dict_datasets[guid]))
-
-        if cli_config == 'rich':
-            spinner.stop()
-            print_output(*output, console=console, no_pager=args.no_pager)
-    elif args.did:
+    if args.did:
         table_data = []
         scope, name = get_scope(args.did, client)
         for dataset in client.list_parent_dids(scope=scope, name=name):
@@ -789,7 +731,7 @@ def list_parent_dids(args, client, logger, console, spinner):
         else:
             print(tabulate(table_data, tablefmt=tablefmt, headers=['SCOPE:NAME', '[DID TYPE]']))
     else:
-        raise InputValidationError('At least one option has to be given. Use -h to list the options.')
+        raise InputValidationError('A DID must be provided. Use -h to list the options.')
     return SUCCESS
 
 
@@ -2403,8 +2345,6 @@ You can filter by key/value, e.g.::
     ''')
     list_parent_parser.set_defaults(function=list_parent_dids)
     list_parent_parser.add_argument(dest='did', action='store', nargs='?', default=None, help='Data identifier.')
-    list_parent_parser.add_argument('--pfn', dest='pfns', action='store', nargs='+', help='List parent dids for these pfns.')
-    list_parent_parser.add_argument('--guid', dest='guids', action='store', nargs='+', help='List parent dids for these guids.')
 
     # argparse 2.7 does not allow aliases for commands, thus the list-parent-datasets is a copy&paste from list-parent-dids
     list_parent_datasets_parser = subparsers.add_parser('list-parent-datasets', help='List parent DIDs for a given DID', description='List all parents Data IDentifier that contains the target Data IDentifier.',
@@ -2423,8 +2363,6 @@ You can filter by key/value, e.g.::
 
     list_parent_datasets_parser.set_defaults(function=list_parent_dids)
     list_parent_datasets_parser.add_argument(dest='did', action='store', nargs='?', default=None, help='Data identifier.')
-    list_parent_datasets_parser.add_argument('--pfn', dest='pfns', action='store', nargs='+', help='List parent dids for these pfns.')
-    list_parent_datasets_parser.add_argument('--guid', dest='guids', action='store', nargs='+', help='List parent dids for these guids.')
 
     # The list-scopes command
     scope_list_parser = subparsers.add_parser('list-scopes', help='List all available scopes.',

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/cli/did.py

@@ -37,11 +37,8 @@ def did():
 @click.option("--short", is_flag=True, default=False, help="Dump the list of DIDs")
 @click.argument("did-pattern", nargs=-1)
 @click.option("--parent", default=False, is_flag=True, help="List the parents of the DID - must use a full DID scope and name")
-# TODO Implement or remove option - view https://github.com/rucio/rucio/issues/7230
-@click.option("--pfn", hidden=True)
-@click.option("--guid", hidden=True)
 @click.pass_context
-def list_(ctx, did_pattern, recursive, filter_, short, parent, pfn, guid):
+def list_(ctx, did_pattern, recursive, filter_, short, parent):
     """
     List the Data IDentifiers matching certain pattern.
     Only the collections (i.e. dataset or container) are returned by default.

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/cli/opendata.py

@@ -95,7 +95,7 @@ def remove_opendata_did(ctx: "Context", did: str) -> None:
 @click.option("--public", required=False, is_flag=True, default=False,
               help="Perform request against the public endpoint")
 @click.pass_context
-def get_opendata_did(ctx: "Context", did: str, include_files: bool, include_metadata: bool, public: bool) -> None:
+def get_opendata_did(ctx: "Context", did: str, files: bool, meta: bool, public: bool) -> None:
     """
     Get information about an Opendata DID, optionally including files and metadata.
     """
@@ -103,7 +103,7 @@ def get_opendata_did(ctx: "Context", did: str, include_files: bool, include_meta
     client = ctx.obj.client
     scope, name = extract_scope(did)
     result = client.get_opendata_did(scope=scope, name=name, public=public,
-                                     include_files=include_files, include_metadata=include_metadata,
+                                     include_files=files, include_metadata=meta,
                                      include_doi=True)
     # TODO: pretty print using tables, etc
     print(json.dumps(result, indent=4, sort_keys=True, ensure_ascii=False))

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/common/schema/__init__.py

@@ -59,23 +59,15 @@ def _get_generic_schema_module():
 if not _is_multivo():
     GENERIC_FALLBACK = 'generic'
 
-    if config.config_has_section('policy'):
-        try:
-            if 'RUCIO_POLICY_PACKAGE' in environ:
-                policy = environ['RUCIO_POLICY_PACKAGE']
-            else:
-                policy = config.config_get('policy', 'package', check_config_table=False)
-            package_module = importlib.import_module(policy)
-            check_policy_module_version(package_module)
-            policy = policy + ".schema"
-        except (NoOptionError, NoSectionError, ModuleNotFoundError):
-            # fall back to old system for now
-            try:
-                policy = config.config_get('policy', 'schema', check_config_table=False)
-            except (NoOptionError, NoSectionError):
-                policy = GENERIC_FALLBACK
-            policy = 'rucio.common.schema.' + policy.lower()
-    else:
+    try:
+        if 'RUCIO_POLICY_PACKAGE' in environ:
+            policy = environ['RUCIO_POLICY_PACKAGE']
+        else:
+            policy = config.config_get('policy', 'package', check_config_table=False, raise_exception=True)
+        package_module = importlib.import_module(policy)
+        check_policy_module_version(package_module)
+        policy = policy + ".schema"
+    except (NoOptionError, NoSectionError, ModuleNotFoundError):
         policy = 'rucio.common.schema.' + GENERIC_FALLBACK.lower()
 
     try:
@@ -102,24 +94,16 @@ if not _is_multivo():
 
 def load_schema_for_vo(vo: str) -> None:
     generic_fallback = 'generic_multi_vo'
-    if config.config_has_section('policy'):
-        try:
-            env_name = 'RUCIO_POLICY_PACKAGE_' + vo.upper()
-            if env_name in environ:
-                policy = environ[env_name]
-            else:
-                policy = config.config_get('policy', 'package-' + vo, check_config_table=False)
-            package_module = importlib.import_module(policy)
-            check_policy_module_version(package_module)
-            policy = policy + ".schema"
-        except (NoOptionError, NoSectionError, ModuleNotFoundError):
-            # fall back to old system for now
-            try:
-                policy = config.config_get('policy', 'schema', check_config_table=False)
-            except (NoOptionError, NoSectionError):
-                policy = generic_fallback
-            policy = 'rucio.common.schema.' + policy.lower()
-    else:
+    try:
+        env_name = 'RUCIO_POLICY_PACKAGE_' + vo.upper()
+        if env_name in environ:
+            policy = environ[env_name]
+        else:
+            policy = config.config_get('policy', 'package-' + vo, check_config_table=False, raise_exception=True)
+        package_module = importlib.import_module(policy)
+        check_policy_module_version(package_module)
+        policy = policy + ".schema"
+    except (NoOptionError, NoSectionError, ModuleNotFoundError):
         policy = 'rucio.common.schema.' + generic_fallback.lower()
 
     try:

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/core/lock.py

@@ -542,7 +542,7 @@ def touch_dataset_locks(dataset_locks: "Iterable[dict[str, Any]]", *, session: "
     for dataset_lock in dataset_locks:
         eol_at = define_eol(dataset_lock['scope'], dataset_lock['name'], rses=[{'id': dataset_lock['rse_id']}], session=session)
         try:
-            stmt = update(
+            update_dslock_stmt = update(
                 models.DatasetLock
             ).where(
                 and_(models.DatasetLock.scope == dataset_lock['scope'],
@@ -553,24 +553,25 @@ def touch_dataset_locks(dataset_locks: "Iterable[dict[str, Any]]", *, session: "
             }).execution_options(
                 synchronize_session=False
             )
-            subq = select(
+            session.execute(update_dslock_stmt)
+
+            update_rule_subq = select(
                 models.DatasetLock.rule_id
             ).where(
                 and_(models.DatasetLock.scope == dataset_lock['scope'],
                      models.DatasetLock.name == dataset_lock['name'],
                      models.DatasetLock.rse_id == dataset_lock['rse_id'])
             )
-
-            stmt = update(
+            update_rule_stmt = update(
                 models.ReplicationRule
             ).where(
-                models.ReplicationRule.id.in_(subq)
+                models.ReplicationRule.id.in_(update_rule_subq)
             ).values({
                 models.ReplicationRule.eol_at: eol_at
             }).execution_options(
                 synchronize_session=False
             )
-            session.execute(stmt)
+            session.execute(update_rule_stmt)
         except DatabaseError:
             return False
 

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/core/permission/__init__.py

@@ -49,20 +49,16 @@ if not multivo:
     if fallback_policy == 'def':
         fallback_policy = generic_fallback
 
-    if config.config_has_section('policy'):
-        try:
-            if 'RUCIO_POLICY_PACKAGE' in environ:
-                policy = environ['RUCIO_POLICY_PACKAGE']
-            else:
-                policy = config.config_get('policy', 'package', check_config_table=False)
-            package_module = importlib.import_module(policy)
-            check_policy_module_version(package_module)
-            policy = policy + ".permission"
-        except (NoOptionError, NoSectionError, ModuleNotFoundError):
-            # fall back to old system for now
-            policy = 'rucio.core.permission.' + fallback_policy.lower()
-    else:
-        policy = 'rucio.core.permission.' + generic_fallback.lower()
+    try:
+        if 'RUCIO_POLICY_PACKAGE' in environ:
+            policy = environ['RUCIO_POLICY_PACKAGE']
+        else:
+            policy = config.config_get('policy', 'package', check_config_table=False, raise_exception=True)
+        package_module = importlib.import_module(policy)
+        check_policy_module_version(package_module)
+        policy = policy + ".permission"
+    except (NoOptionError, NoSectionError, ModuleNotFoundError):
+        policy = 'rucio.core.permission.' + fallback_policy.lower()
 
     try:
         module = importlib.import_module(policy)
@@ -86,24 +82,16 @@ if not multivo:
 
 def load_permission_for_vo(vo: str) -> None:
     generic_fallback = 'generic_multi_vo'
-    if config.config_has_section('policy'):
-        try:
-            env_name = 'RUCIO_POLICY_PACKAGE_' + vo.upper()
-            if env_name in environ:
-                policy = environ[env_name]
-            else:
-                policy = config.config_get('policy', 'package-' + vo)
-            package_module = importlib.import_module(policy)
-            check_policy_module_version(package_module)
-            policy = policy + ".permission"
-        except (NoOptionError, NoSectionError, ModuleNotFoundError):
-            # fall back to old system for now
-            try:
-                policy = config.config_get('policy', 'permission')
-            except (NoOptionError, NoSectionError):
-                policy = generic_fallback
-            policy = 'rucio.core.permission.' + policy.lower()
-    else:
+    try:
+        env_name = 'RUCIO_POLICY_PACKAGE_' + vo.upper()
+        if env_name in environ:
+            policy = environ[env_name]
+        else:
+            policy = config.config_get('policy', 'package-' + vo, raise_exception=True)
+        package_module = importlib.import_module(policy)
+        check_policy_module_version(package_module)
+        policy = policy + ".permission"
+    except (NoOptionError, NoSectionError, ModuleNotFoundError):
         policy = 'rucio.core.permission.' + generic_fallback.lower()
 
     try:

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/core/request.py

@@ -22,6 +22,7 @@ import threading
 import traceback
 from abc import ABCMeta, abstractmethod
 from collections import defaultdict, namedtuple
+from collections.abc import Sized
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, Optional, Union
 
@@ -310,7 +311,11 @@ def queue_requests(
     :param logger:    Optional decorated logger that can be passed from the calling daemons or servers.
     :returns:         List of Request-IDs as 32 character hex strings.
     """
-    logger(logging.DEBUG, "queue requests")
+
+    if isinstance(requests, Sized):
+        logger(logging.DEBUG, "Queuing %d requests", len(requests))
+    else:
+        logger(logging.DEBUG, "Queuing requests")
 
     request_clause = []
     rses = {}

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/abacus/account.py

@@ -66,7 +66,7 @@ def run_once(
 
     # If the list is empty, sent the worker to sleep
     if not updated_account_counters:
-        logger(logging.INFO, 'did not get any work')
+        logger(logging.INFO, 'Did not get any work')
         return
 
     for account_counter in updated_account_counters:

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/abacus/collection_replica.py

@@ -71,7 +71,7 @@ def run_once(
     logger(logging.DEBUG, 'Index query time %f size=%d' % (time.time() - start, len(replicas)))
     # If the list is empty, sent the worker to sleep
     if not replicas:
-        logger(logging.INFO, 'did not get any work')
+        logger(logging.INFO, 'Did not get any work')
         must_sleep = True
         return must_sleep
 

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/abacus/rse.py

@@ -67,7 +67,7 @@ def run_once(
 
     # If the list is empty, sent the worker to sleep
     if not rse_ids:
-        logger(logging.INFO, 'did not get any work')
+        logger(logging.INFO, 'Did not get any work')
         return
 
     for rse_id in rse_ids:

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/common.py

@@ -118,7 +118,7 @@ def _activity_looper(
         sleep_time: int,
         activities: Optional['Sequence[str]'],
         heartbeat_handler: HeartbeatHandler,
-) -> 'Generator[tuple[str, float], tuple[float, bool], None]':
+) -> 'Generator[tuple[Optional[str], float], tuple[float, bool], None]':
     """
     Generator which loops (either once, or indefinitely) over all activities while ensuring that `sleep_time`
     passes between handling twice the same activity.
@@ -200,7 +200,7 @@ def db_workqueue(
 
             with HeartbeatHandler(executable=executable, renewal_interval=sleep_time - 1) as heartbeat_handler:
                 logger = heartbeat_handler.logger
-                logger(logging.INFO, 'started')
+                logger(logging.INFO, 'Daemon started')
 
                 if partition_wait_time:
                     graceful_stop.wait(partition_wait_time)

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/conveyor/finisher.py

@@ -66,7 +66,7 @@ def _fetch_requests(
         set_last_processed_by: bool,
         cached_topology: Optional[ExpiringObjectCache],
         heartbeat_handler: "HeartbeatHandler",
-        activity: str,
+        activity: Optional[str],
 ) -> tuple[bool, tuple[list[dict[str, Any]], Topology]]:
     worker_number, total_workers, logger = heartbeat_handler.live()
 
@@ -184,7 +184,7 @@ def finisher(
     )
     def _db_producer(
         *,
-        activity: str,
+        activity: Optional[str],
         heartbeat_handler: "HeartbeatHandler"
     ) -> tuple[bool, tuple[list[dict[str, Any]], Topology]]:
         return _fetch_requests(

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/conveyor/poller.py

@@ -66,7 +66,7 @@ def _fetch_requests(
         transfertool: Optional[str],
         filter_transfertool: Optional[str],
         cached_topology: Optional[ExpiringObjectCache],
-        activity: str,
+        activity: Optional[str],
         set_last_processed_by: bool,
         heartbeat_handler: "HeartbeatHandler"
 ) -> tuple[bool, list[dict[str, Any]]]:
@@ -196,7 +196,7 @@ def poller(
     )
     def _db_producer(
         *,
-        activity: str,
+        activity: Optional[str],
         heartbeat_handler: "HeartbeatHandler"
     ) -> tuple[bool, list[dict[str, Any]]]:
         return _fetch_requests(

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/conveyor/preparer.py

@@ -100,7 +100,7 @@ def preparer(
         sleep_time=sleep_time)
     def _db_producer(
         *,
-        activity: str,
+        activity: Optional[str],
         heartbeat_handler: "HeartbeatHandler"
     ) -> tuple[bool, tuple[Topology, dict[str, RequestWithSources]]]:
         return _fetch_requests(

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/conveyor/submitter.py

@@ -55,7 +55,7 @@ TRANSFER_TYPE = config_get('conveyor', 'transfertype', False, 'single')
 def _fetch_requests(
         partition_hash_var: Optional[str],
         bulk: int,
-        activity: str,
+        activity: Optional[str],
         rse_ids: Optional[list[str]],
         request_type: list[RequestType],
         ignore_availability: bool,
@@ -285,7 +285,7 @@ def submitter(
         activities=activities)
     def _db_producer(
         *,
-        activity: str,
+        activity: Optional[str],
         heartbeat_handler: "HeartbeatHandler"
     ) -> tuple[bool, tuple[Topology, dict[str, RequestWithSources]]]:
         return _fetch_requests(

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/conveyor/throttler.py

@@ -102,7 +102,7 @@ def throttler(
         sleep_time=sleep_time)
     def _db_producer(
             *,
-            activity: str,
+            activity: Optional[str],
             heartbeat_handler: "HeartbeatHandler"
     ) -> tuple[bool, Optional["ReleaseGroupsDict"]]:
         worker_number, total_workers, logger = heartbeat_handler.live()

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/hermes/hermes.py

@@ -799,19 +799,20 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
             except Exception as error:
                 logger(logging.ERROR, "Error sending to ActiveMQ : %s", str(error))
 
-    logger(logging.INFO, "Deleting %s messages", len(to_delete))
-    to_delete = [
-        {
-            "id": message["id"],
-            "created_at": message["created_at"],
-            "updated_at": message["created_at"],
-            "payload": str(message["payload"]),
-            "event_type": message["event_type"],
-            "services": message["services"]
-        }
-        for message in to_delete
-    ]
-    delete_messages(messages=to_delete)
+        logger(logging.INFO, "Deleting %s messages", len(to_delete))
+        to_delete = [
+            {
+                "id": message["id"],
+                "created_at": message["created_at"],
+                "updated_at": message["created_at"],
+                "payload": str(message["payload"]),
+                "event_type": message["event_type"],
+                "services": message["services"]
+            }
+            for message in to_delete
+        ]
+        delete_messages(messages=to_delete)
+
     must_sleep = True
     return must_sleep
 

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/judge/cleaner.py

@@ -85,10 +85,10 @@ def run_once(
                               worker_number=worker_number,
                               limit=200,
                               blocked_rules=[key for key in paused_rules])
-    logger(logging.DEBUG, 'index query time %f fetch size is %d' % (time.time() - start, len(rules)))
+    logger(logging.DEBUG, 'Index query time %f fetch size is %d' % (time.time() - start, len(rules)))
 
     if not rules:
-        logger(logging.DEBUG, 'did not get any work (paused_rules=%s)' % str(len(paused_rules)))
+        logger(logging.DEBUG, 'Did not get any work (paused_rules=%s)' % str(len(paused_rules)))
         return
 
     for rule in rules:

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/judge/evaluator.py

@@ -92,12 +92,12 @@ def run_once(
                             worker_number=worker_number,
                             limit=did_limit,
                             blocked_dids=[(InternalScope(key[0], from_external=False), key[1]) for key in paused_dids])
-    logger(logging.DEBUG, 'index query time %f fetch size is %d (%d blocked)', time.time() - start, len(dids),
+    logger(logging.DEBUG, 'Index query time %f fetch size is %d (%d blocked)', time.time() - start, len(dids),
            len([(InternalScope(key[0], from_external=False), key[1]) for key in paused_dids]))
 
     # If the list is empty, sent the worker to sleep
     if not dids:
-        logger(logging.DEBUG, 'did not get any work (paused_dids=%s)', str(len(paused_dids)))
+        logger(logging.DEBUG, 'Did not get any work (paused_dids=%s)', str(len(paused_dids)))
         return
 
     done_dids = {}

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/judge/injector.py

@@ -83,10 +83,10 @@ def run_once(
                                worker_number=worker_number,
                                limit=100,
                                blocked_rules=[key for key in paused_rules])
-    logger(logging.DEBUG, 'index query time %f fetch size is %d' % (time.time() - start, len(rules)))
+    logger(logging.DEBUG, 'Index query time %f fetch size is %d' % (time.time() - start, len(rules)))
 
     if not rules:
-        logger(logging.DEBUG, 'did not get any work (paused_rules=%s)' % str(len(paused_rules)))
+        logger(logging.DEBUG, 'Did not get any work (paused_rules=%s)' % str(len(paused_rules)))
         return
 
     for rule_id in rules:
@@ -97,12 +97,13 @@ def run_once(
         try:
             start = time.time()
             inject_rule(rule_id=rule_id, logger=logger)
-            logger(logging.DEBUG, 'injection of %s took %f' % (rule_id, time.time() - start))
+            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])) 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)
+                logger(logging.WARNING,
+                       'Database locks detected for %s. Another instance might be processing this rule at the moment' % rule_id)
             elif match('.*QueuePool.*', str(e.args[0])):
                 logger(logging.WARNING, 'DatabaseException', exc_info=True)
                 METRICS.counter('exceptions.{exception}').labels(exception=e.__class__.__name__).inc()

{rucio-38.0.0rc3 → rucio-38.2.0}/lib/rucio/daemons/judge/repairer.py

@@ -90,10 +90,10 @@ def run_once(
                             limit=100,
                             blocked_rules=[key for key in paused_rules])
 
-    logger(logging.DEBUG, 'index query time %f fetch size is %d' % (time.time() - start, len(rules)))
+    logger(logging.DEBUG, 'Index query time %f fetch size is %d' % (time.time() - start, len(rules)))
 
     if not rules:
-        logger(logging.DEBUG, 'did not get any work (paused_rules=%s)' % (str(len(paused_rules))))
+        logger(logging.DEBUG, 'Did not get any work (paused_rules=%s)' % (str(len(paused_rules))))
         return
 
     for rule_id in rules:

rucio-38.2.0/lib/rucio/vcsversion.py

@@ -0,0 +1,11 @@
+
+'''
+This file is automatically generated; Do not edit it. :)
+'''
+VERSION_INFO = {
+    'final': True,
+    'version': '38.2.0',
+    'branch_nick': 'release-38-LTS',
+    'revision_id': 'af0cedfc38c83fa06e4b82991d0c04a1129440a9',
+    'revno': 13963
+}