rucio 35.4.1__tar.gz → 35.5.0__tar.gz

{rucio-35.4.1 → rucio-35.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio
-Version: 35.4.1
+Version: 35.5.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-35.4.1 → rucio-35.5.0}/lib/rucio/transfertool/fts3.py

@@ -1041,10 +1041,9 @@ class FTS3Transfertool(Transfertool):
             if isinstance(activity_id, int):
                 t_file['scitag'] = self.scitags_exp_id << 6 | activity_id
 
-        for plugin in self.tape_metadata_plugins:
-            plugin_hints = plugin.hints(t_file['metadata'])
-
-            t_file = deep_merge_dict(source=plugin_hints, destination=t_file)
+        if t_file['metadata']['dst_type'] == 'TAPE':
+            for plugin in self.tape_metadata_plugins:
+                t_file = deep_merge_dict(source=plugin.hints(t_file['metadata']), destination=t_file)
 
         return t_file
 

{rucio-35.4.1 → rucio-35.5.0}/lib/rucio/transfertool/fts3_plugins.py

@@ -62,7 +62,7 @@ class FTS3TapeMetadataPlugin(PolicyPackageAlgorithms):
             func=lambda x: cls._activity_hints(cls, x),  # type: ignore
             init_func=lambda: cls._init_instance_activity_hints(cls))  # type: ignore
         cls.register(cls.DEFAULT, func=lambda x: cls._default(cls, x))  # type: ignore
-        cls.register("test", func=lambda x: cls._collocation(cls, cls._test_collocation, x))  # type: ignore
+        cls.register("test", func=lambda x: cls._collocation(cls._test_collocation, x))
 
     @classmethod
     def register(cls: type[FTS3TapeMetadataPluginType], name: str, func: Callable, init_func: Optional[Callable] = None) -> None:
@@ -99,17 +99,19 @@ class FTS3TapeMetadataPlugin(PolicyPackageAlgorithms):
 
         return {"scheduling_hints": {"priority": priority}}
 
-    def _collocation(self, collocation_func: Callable, hints: dict[str, Any]) -> dict[str, dict]:
+    @staticmethod
+    def _collocation(collocation_func: 'Callable', hints: dict[str, Any]) -> dict[str, dict]:
         """
-        Wraps a 'collacation' style plugin for formatting
+        Wraps a 'collocation' style plugin for formatting
 
         :param collocation_func: Function that defines the collocation rules
         :param hints: kwargs utilized by the collocation rules
         :return: Collocation hints produced by the collocation_func, wrapped
         """
-        return {"collocation_hints": collocation_func(*hints)}
+        return {"collocation_hints": collocation_func(**hints)}
 
-    def _test_collocation(self, *hint: dict) -> dict[str, Any]:
+    @staticmethod
+    def _test_collocation(**kwargs: dict) -> dict[str, Any]:
         return {"0": "", "1": "", "2": "", "3": ""}
 
     def _default(self, *hints: dict) -> dict:

{rucio-35.4.1 → rucio-35.5.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '35.4.1',
+    'version': '35.5.0',
     'branch_nick': 'release-35-LTS',
-    'revision_id': 'b041c5990126a6987d2f884680869fc93b609acc',
-    'revno': 13162
+    'revision_id': 'f5e7f329eb6baed9096242ee497152cd14464b2c',
+    'revno': 13174
 }

{rucio-35.4.1 → rucio-35.5.0}/lib/rucio/web/rest/flaskapi/v1/auth.py

@@ -185,7 +185,6 @@ class UserPass(ErrorHandlingMethodView):
         headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
         headers.add('Cache-Control', 'post-check=0, pre-check=0')
         headers['Pragma'] = 'no-cache'
-
         vo = extract_vo(request.headers)
         account = request.headers.get('X-Rucio-Account', default=None)
         username = request.headers.get('X-Rucio-Username', default=None)

{rucio-35.4.1 → rucio-35.5.0}/tests/test_transfer_plugins.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import logging
+from unittest.mock import MagicMock
 
 import pytest
 
@@ -31,9 +32,14 @@ MAX_POLL_WAIT_SECONDS = 60
 TEST_FTS_HOST = "https://fts:8446"
 
 
-def _make_transfer_path(did, rse_factory, root_account):
+def _make_transfer_path(
+        did,
+        rse_factory,
+        root_account,
+        dst_rse_is_tape: bool = True
+):
     _, src_rse_id = rse_factory.make_mock_rse()
-    dst_rse, dst_rse_id = rse_factory.make_mock_rse()
+    dst_rse, dst_rse_id = rse_factory.make_mock_rse(rse_type="TAPE" if dst_rse_is_tape else "DISK")
     all_rses = [src_rse_id, dst_rse_id]
     distance_core.add_distance(src_rse_id, dst_rse_id, distance=1)
 
@@ -229,8 +235,8 @@ def test_multiple_plugin_concat(file_config_mock, did_factory, rse_factory, root
     generated_collocation_hints = job_params["archive_metadata"]["collocation_hints"]
     assert expected_hints["collocation_hints"] == generated_collocation_hints
 
-    expected_schedule_hints = job_params["archive_metadata"]["scheduling_hints"]
-    assert expected_hints["scheduling_hints"] == expected_schedule_hints
+    generated_scheduling_hints = job_params["archive_metadata"]["scheduling_hints"]
+    assert expected_hints["scheduling_hints"] == generated_scheduling_hints
 
 
 @pytest.mark.parametrize("file_config_mock", [
@@ -284,3 +290,33 @@ def test_include_none_by_default(did_factory, rse_factory, root_account):
 
     job_params = fts3_tool._file_from_transfer(transfer_path[0], job_params)
     assert "archive_metadata" not in job_params
+
+
+def test_no_metadata_if_dest_is_not_tape(did_factory, rse_factory, root_account):
+    """
+    If the destination RSE is not tape,
+    no tape metadata plugin should run,
+    and no archive metadata should be included.
+    """
+
+    mock_did = did_factory.random_file_did()
+    mock_metadata_plugin = MagicMock()
+    transfer_path = _make_transfer_path(mock_did, rse_factory, root_account, dst_rse_is_tape=False)
+
+    fts3_tool = FTS3Transfertool(TEST_FTS_HOST)
+
+    fts3_tool.tape_metadata_plugins = [mock_metadata_plugin]  # type: ignore
+
+    job_params = build_job_params(
+        transfer_path=transfer_path,
+        bring_online=None,
+        default_lifetime=None,
+        archive_timeout_override=None,
+        max_time_in_queue=None,
+        logger=logging.log,
+    )
+
+    job_params = fts3_tool._file_from_transfer(transfer_path[0], job_params)
+
+    assert not mock_metadata_plugin.called
+    assert "archive_metadata" not in job_params