rucio 38.0.0rc1__tar.gz → 38.0.0rc3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 38.0.0rc1
+Version: 38.0.0rc3
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -52,6 +52,7 @@ Requires-Dist: pymongo<=4.11.2; extra == "mongo"
 Provides-Extra: elastic
 Requires-Dist: elasticsearch<=8.15.1; extra == "elastic"
 Provides-Extra: postgresql
+Requires-Dist: psycopg<=3.2.3; extra == "postgresql"
 Requires-Dist: psycopg-binary<=3.2.3; extra == "postgresql"
 Requires-Dist: psycopg-pool<=3.2.3; extra == "postgresql"
 Provides-Extra: mysql

{rucio-38.0.0rc1 → rucio-38.0.0rc3}/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.0rc1 → rucio-38.0.0rc3}/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.0rc1 → rucio-38.0.0rc3}/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.0rc1 → rucio-38.0.0rc3}/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.0rc1 → rucio-38.0.0rc3}/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.0.0rc1 → rucio-38.0.0rc3}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '38.0.0rc1',
+    'version': '38.0.0rc3',
     'branch_nick': 'master',
-    'revision_id': '7f986b67665c21ac40a2b32732b2f263bafd2f6c',
-    'revno': 13890
+    'revision_id': 'c4df1306d192b518b38e023e783ea998c6c0dfb5',
+    'revno': 13917
 }

{rucio-38.0.0rc1 → rucio-38.0.0rc3}/lib/rucio/web/rest/flaskapi/v1/main.py

@@ -53,6 +53,7 @@ DEFAULT_ENDPOINTS = {
     'opendata_public',
 }
 
+
 def apply_endpoints(app: Flask, modules: "Iterable[str]") -> None:
     for blueprint_module in modules:
         try:

{rucio-38.0.0rc1 → rucio-38.0.0rc3}/setuputil.py

@@ -93,6 +93,7 @@ server_requirements_table = {
         'mongo': ['pymongo<=4.11.2'],
         'elastic': ['elasticsearch<=8.15.1'],
         'postgresql': [
+            'psycopg<=3.2.3',
             'psycopg-binary<=3.2.3',
             'psycopg-pool<=3.2.3',
         ],

{rucio-38.0.0rc1 → rucio-38.0.0rc3}/tests/test_hermes.py

@@ -59,16 +59,8 @@ class MyListener:
         {
             "table_content": [
                 ("hermes", "services_list", "influx,activemq,elastic,email"),
-                (
-                    "hermes",
-                    "elastic_endpoint",
-                    "http://localhost:9200/ddm_events/doc/_bulk",
-                ),
-                (
-                    "hermes",
-                    "influxdb_endpoint",
-                    "http://localhost:8086/api/v2/write?org=rucio&bucket=rucio",
-                ),
+                ("hermes", "elastic_endpoint", "http://elasticsearch:9200/ddm_events/doc/_bulk"),
+                ("hermes", "influxdb_endpoint", "http://influxdb:8086/api/v2/write?org=rucio&bucket=rucio"),
                 ("hermes", "influxdb_token", "mytoken"),
                 ("messaging-hermes", "destination", "/queue/events"),
                 ("messaging-hermes", "brokers", "localhost"),
@@ -76,22 +68,16 @@ class MyListener:
                 ("messaging-hermes", "username", "hermes"),
                 ("messaging-hermes", "password", "supersecret"),
                 ("messaging-hermes", "nonssl_port", 61613),
-                ("messaging-hermes", "send_email", False),
+                ("messaging-hermes", "send_email", True),
+                ("messaging-hermes", "smtp_host", "testing.host"),
+                ("messaging-hermes", "smtp_port", 1234),
             ]
         },
         {
             "table_content": [
                 ("hermes", "services_list", "influx,activemq,elastic,email"),
-                (
-                    "hermes",
-                    "elastic_endpoint",
-                    "http://localhost:9200/ddm_events/doc/_bulk",
-                ),
-                (
-                    "hermes",
-                    "influxdb_endpoint",
-                    "http://localhost:8086/api/v2/write?org=rucio&bucket=rucio",
-                ),
+                ("hermes", "elastic_endpoint", "http://elasticsearch:9200/ddm_events/doc/_bulk"),
+                ("hermes", "influxdb_endpoint", "http://influxdb:8086/api/v2/write?org=rucio&bucket=rucio"),
                 ("hermes", "influxdb_token", "mytoken"),
                 ("messaging-hermes", "destination", "/queue/events"),
                 ("messaging-hermes", "brokers", "localhost"),
@@ -99,9 +85,9 @@ class MyListener:
                 ("messaging-hermes", "username", "hermes"),
                 ("messaging-hermes", "password", "supersecret"),
                 ("messaging-hermes", "nonssl_port", 61613),
-                ("messaging-hermes", "send_email", False),
-                ("messaging-hermes", "smtp-host", "testing.host"),
-                ("messaging-hermes", "smtp-port", 1234),
+                ("messaging-hermes", "send_email", True),
+                ("messaging-hermes", "smtp_host", "testing.host"),
+                ("messaging-hermes", "smtp_port", 1234),
             ]
         }
     ],
@@ -205,7 +191,11 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
         smtp_mock = MagicMock()
         m.setattr(hermes.smtplib, "SMTP", smtp_mock)
         hermes.hermes(once=True)
-        smtp_mock.assert_called_with(host="testing.host", port=1234)
+        smtp_host = config_get("messaging-hermes", "smtp_host", default='', raise_exception=False)
+        if not smtp_host:
+            smtp_mock.assert_called_with()
+        else:
+            smtp_mock.assert_called_with(host="testing.host", port=1234)
     service_dict = {"influx": 0, "elastic": 0, "email": 0, "activemq": 0}
     messages = retrieve_messages(50, old_mode=False)
     for message in messages:
@@ -247,7 +237,7 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
     # Checking influxDB
     assert service_dict["influx"] == 0
     res = requests.get(
-        "http://localhost:8086/query?db=rucio",
+        "http://influxdb:8086/query?db=rucio",
         headers={"Authorization": "Token mytoken"},
         params={"q": "SELECT * FROM deletion"},
     )
@@ -273,7 +263,7 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
     data = ' { "query": { "match_all": {} } }'
     headers = {"Content-Type": "application/json"}
     response = requests.post(
-        "http://localhost:9200/_search?size=1000", data=data, headers=headers
+        "http://elasticsearch:9200/_search?size=1000", data=data, headers=headers
     )
     assert response.status_code == 200
     res = response.json()