rucio 38.0.0rc2__tar.gz → 38.1.0__tar.gz

{rucio-38.0.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.0}/PKG-INFO

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

{rucio-38.0.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.0}/lib/rucio/common/exception.py

@@ -1215,7 +1215,7 @@ class OpenDataError(RucioException):
 
     def __init__(self, *args):
         super(OpenDataError, self).__init__(*args)
-        self._message = f"Error related to open data."
+        self._message = "Error related to open data."
         self.error_code = 115
 
 
@@ -1226,7 +1226,7 @@ class OpenDataDataIdentifierNotFound(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataDataIdentifierNotFound, self).__init__(*args)
-        self._message = f"Data identifier not found in the open data catalog."
+        self._message = "Data identifier not found in the open data catalog."
         self.error_code = 116
 
 
@@ -1237,7 +1237,7 @@ class OpenDataDataIdentifierAlreadyExists(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataDataIdentifierAlreadyExists, self).__init__(*args)
-        self._message = f"Data identifier already exists in the open data catalog."
+        self._message = "Data identifier already exists in the open data catalog."
         self.error_code = 117
 
 
@@ -1248,7 +1248,7 @@ class OpenDataInvalidState(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataInvalidState, self).__init__(*args)
-        self._message = f"Open data entry is in an invalid state."
+        self._message = "Open data entry is in an invalid state."
         self.error_code = 118
 
 
@@ -1259,5 +1259,5 @@ class OpenDataInvalidStateUpdate(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataInvalidStateUpdate, self).__init__(*args)
-        self._message = f"Invalid state update attempted on open data entry."
+        self._message = "Invalid state update attempted on open data entry."
         self.error_code = 119

{rucio-38.0.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.0}/lib/rucio/common/utils.py

@@ -399,7 +399,7 @@ class NonDeterministicPFNAlgorithms(PolicyPackageAlgorithms):
         Initialises a non-deterministic PFN construction object
         """
         super().__init__()
-        
+
         self.vo = vo
 
     def construct_non_deterministic_pfn(self, dsn: str, scope: Optional[str], filename: str, naming_convention: str) -> str:

{rucio-38.0.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.

{rucio-38.0.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.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.0rc2 → rucio-38.1.0}/lib/rucio/db/sqla/models.py

@@ -517,6 +517,7 @@ class OpenDataDOI(BASE, ModelBase):
         Index('OPENDATA_DOI_CREATED_AT_IDX', 'created_at'),
     )
 
+
 class OpenDataMeta(BASE, ModelBase):
     """Mapping between OpenData DIDs and DOIs"""
     __tablename__ = 'dids_opendata_meta'
@@ -535,6 +536,7 @@ class OpenDataMeta(BASE, ModelBase):
         ),
     )
 
+
 class VirtualPlacements(BASE, ModelBase):
     """Represents virtual placements"""
     __tablename__ = 'virtual_placements'

{rucio-38.0.0rc2 → rucio-38.1.0}/lib/rucio/db/sqla/session.py

@@ -38,6 +38,8 @@ from rucio.db.sqla.constants import DatabaseOperationType
 
 EXTRA_MODULES = import_extras(['MySQLdb', 'pymysql'])
 
+LOG = logging.getLogger(__name__)
+
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
     from typing import Optional, ParamSpec, TypeVar
@@ -71,7 +73,6 @@ DEFAULT_SCHEMA_NAME = config_get(DATABASE_SECTION, 'schema',
 _METADATA = MetaData(schema=DEFAULT_SCHEMA_NAME)
 _MAKER, _ENGINE, _LOCK = None, None, Lock()
 
-
 SQLA_CONFIG_POOLCLASS_MAPPING = {
     'queuepool': QueuePool,
     'singletonthreadpool': SingletonThreadPool,
@@ -218,6 +219,12 @@ def get_engine() -> 'Engine':
         if 'mysql' in sql_connection:
             conv = mysql_convert_decimal_to_float(pymysql=sql_connection.startswith('mysql+pymysql'))
             params['connect_args'] = {'conv': conv}
+        elif 'oracle' in sql_connection:
+            try:
+                import oracledb  # pylint: disable=import-error
+                oracledb.init_oracle_client()
+            except Exception as err:
+                LOG.warning('Could not start Oracle thick mode; falling back to thin: %s', err)
         for param, param_type in config_params:
             try:
                 params[param] = param_type(config_get(DATABASE_SECTION, param, check_config_table=False))

{rucio-38.0.0rc2 → rucio-38.1.0}/lib/rucio/tests/common.py

@@ -50,23 +50,75 @@ skip_outside_gh_actions = pytest.mark.skipif(os.getenv("GITHUB_ACTIONS") != "tru
                                              reason="Skipping tests outside GitHub Actions")
 
 
-def is_influxdb_available() -> bool:
-    """Return True if influxdb is available, else return False."""
+def is_influxdb_available(
+        url: str = "http://influxdb:8086",
+        timeout: float = 2.0
+) -> bool:
+    """
+    Return True when InfluxDB is up and ready for queries, otherwise False.
+
+    Strategy:
+    1. Try /health           → 200 + JSON["status"] == "pass"
+    2. Fallback to /ping     → 204
+    """
+    print(f"Checking InfluxDB availability at {url}")
+    try:
+        r = requests.get(f"{url}/health", timeout=timeout)
+        print(f"InfluxDB /health responded with {r.status_code} and body: {r.text}", r.status_code, r.text)
+        if r.status_code == 200 and r.json().get("status") == "pass":
+            return True
+        print(f"InfluxDB is not running healthy at {url}.")
+        return False
+    except requests.RequestException as e:
+        # /health failed or is not available (pre‑1.8)
+        print(f"Failed to query InfluxDB /health at {url}: {e}")
+
     try:
-        response = requests.get('http://localhost:8086/ping')
-        return response.status_code == 204
-    except requests.exceptions.ConnectionError:
-        print('InfluxDB is not running at localhost:8086')
+        print(f"Falling back to /ping for InfluxDB at {url}")
+        r = requests.get(f"{url}/ping", timeout=timeout)
+        print(f"InfluxDB /ping responded with {r.status_code}")
+        return r.status_code == 204
+    except requests.RequestException as e:
+        print(f"InfluxDB is not reachable at {url}: {e}")
         return False
 
 
-def is_elasticsearch_available() -> bool:
-    """Return True if elasticsearch is available, else return False."""
+def is_elasticsearch_available(
+        url: str = "http://elasticsearch:9200",
+        timeout: float = 2.0,
+        min_status: str = 'green',
+) -> bool:
+    """
+    Return True when the Elasticsearch node is reachable **and**
+    cluster health is at least `min_status` ('red'<'yellow'<'green').
+
+    1. GET /_cluster/health  → 200 + JSON["status"] meets threshold
+    2. Fallback: HEAD /      → 200 (port open but health unknown)
+    """
+    _status_level = {"red": 1, "yellow": 2, "green": 3}
+
+    print(f"Checking Elasticsearch availability at {url}")
+    try:
+        r = requests.get(f"{url}/_cluster/health", timeout=timeout)
+        print(f"Elasticsearch /_cluster/health responded with {r.status_code} and body: {r.text}")
+        if r.status_code == 200:
+            status = r.json().get("status")
+            if status and _status_level[status] >= _status_level[min_status]:
+                return True
+            print(f"Elasticsearch health is {status!r}, below threshold {min_status!r}.")
+            return False
+    except requests.RequestException as e:
+        # Either not reachable or /_cluster/health not yet available
+        print(f"Failed to query Elasticsearch /_cluster/health at {url}: {e}")
+
+    # Very old nodes or boot‑strapping clusters: fall back to a simple HEAD /
     try:
-        response = requests.get('http://localhost:9200/')
-        return response.status_code == 200
-    except requests.exceptions.ConnectionError:
-        print('Elasticsearch is not running at localhost:9200')
+        print(f"Falling back to HEAD request for Elasticsearch at {url}")
+        r = requests.head(url, timeout=timeout)
+        print(f"Elasticsearch HEAD / responded with {r.status_code}")
+        return r.status_code == 200
+    except requests.RequestException as e:
+        print(f"Elasticsearch is not reachable at {url}: {e}")
         return False
 
 

rucio-38.1.0/lib/rucio/vcsversion.py

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