rucio 38.1.0__tar.gz → 38.2.0__tar.gz

{rucio-38.1.0 → rucio-38.2.0}/PKG-INFO

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

{rucio-38.1.0 → 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.1.0 → 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.1.0 → 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.1.0 → 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.1.0 → 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.1.0 → rucio-38.2.0}/lib/rucio/daemons/common.py

@@ -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.1.0 → 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.1.0 → 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.1.0 → 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.1.0 → 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.1.0 → 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.1.0 → rucio-38.2.0}/lib/rucio/vcsversion.py

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

{rucio-38.1.0 → rucio-38.2.0}/tests/test_opendata.py

@@ -509,7 +509,7 @@ class TestOpenDataCLI:
             f"Subcommand '{subcommand}': expected options {expected_options}, got {options}"
         )
 
-    def test_opendata_cli_list_add_remove(self, mock_scope):
+    def test_opendata_cli_add_show_list_remove(self, mock_scope):
         exitcode, stdout, stderr = execute("rucio opendata did list")
         assert exitcode == 0, f"Command 'rucio opendata list' failed with error: {stderr.strip()}"
         assert "ERROR" not in stderr.upper(), f"Command 'rucio opendata list' failed with error: {stderr.strip()}"
@@ -534,6 +534,9 @@ class TestOpenDataCLI:
         assert exitcode == 1, f"Expected failure when adding existing opendata DID: {stderr.strip()}"
         assert "OpenDataDataIdentifierAlreadyExists" in stderr, "Expected 'OpenDataDataIdentifierAlreadyExists' error in output"
 
+        exitcode, _, stderr = execute(f"rucio opendata did show {mock_scope}:{name}")
+        assert exitcode == 0, f"Failed to show opendata DID: {stderr.strip()}"
+
         exitcode, stdout, stderr = execute("rucio opendata did list")
         assert exitcode == 0, f"Failed to list opendata: {stderr.strip()}"
         assert f"{name}" in stdout, f"Expected {mock_scope}:{name} in opendata list"