rucio-clients 33.3.0__tar.gz → 33.4.0__tar.gz

{rucio-clients-33.3.0 → rucio-clients-33.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio-clients
-Version: 33.3.0
+Version: 33.4.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-clients-33.3.0 → rucio-clients-33.4.0}/lib/rucio/client/subscriptionclient.py

@@ -95,9 +95,10 @@ class SubscriptionClient(BaseClient):
         result = self._send_request(url, type_='GET')
         if result.status_code == codes.ok:   # pylint: disable=no-member
             return self._load_json_data(result)
-        else:
-            exc_cls, exc_msg = self._get_exception(headers=result.headers, status_code=result.status_code, data=result.content)
-            raise exc_cls(exc_msg)
+        if result.status_code == codes.not_found:
+            return []
+        exc_cls, exc_msg = self._get_exception(headers=result.headers, status_code=result.status_code, data=result.content)
+        raise exc_cls(exc_msg)
 
     def update_subscription(self, name, account=None, filter_=None, replication_rules=None, comments=None, lifetime=None, retroactive=None, dry_run=None, priority=None):
         """

{rucio-clients-33.3.0 → rucio-clients-33.4.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '33.3.0',
+    'version': '33.4.0',
     'branch_nick': 'release-33',
-    'revision_id': '9680557705d85a458a9c0b5124f57c917e28517b',
-    'revno': 12698
+    'revision_id': '501f39cf4ba83caccda9a683e1f4c6008ed1b685',
+    'revno': 12708
 }

{rucio-clients-33.3.0 → rucio-clients-33.4.0}/tests/test_conveyor.py

@@ -52,7 +52,7 @@ from rucio.transfertool.fts3 import FTS3Transfertool
 from tests.ruciopytest import NoParallelGroups
 from tests.mocks.mock_http_server import MockServer
 
-MAX_POLL_WAIT_SECONDS = 60
+MAX_POLL_WAIT_SECONDS = 100
 TEST_FTS_HOST = 'https://fts:8446'
 
 
@@ -823,7 +823,6 @@ def test_non_deterministic_dst(did_factory, did_client, root_account, vo, caches
 
 
 @skip_rse_tests_with_accounts
-@pytest.mark.dirty(reason="Submits a transfer to FTS which cannot be ever executed in this test env.")
 @pytest.mark.noparallel(groups=[NoParallelGroups.STAGER, NoParallelGroups.POLLER, NoParallelGroups.FINISHER])
 def test_stager(rse_factory, did_factory, root_account, replica_client):
     """
@@ -861,8 +860,8 @@ def test_stager(rse_factory, did_factory, root_account, replica_client):
                                            'requested_at': datetime.utcnow()}])
     stager(once=True, rses=[{'id': rse_id} for rse_id in all_rses])
 
-    request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
-    assert request['state'] == RequestState.SUBMITTED
+    replica = __wait_for_replica_transfer(dst_rse_id=dst_rse_id, max_wait_seconds=2 * MAX_POLL_WAIT_SECONDS, **did)
+    assert replica['state'] == ReplicaState.AVAILABLE
 
 
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.FINISHER])
@@ -1579,6 +1578,53 @@ def test_checksum_validation(rse_factory, did_factory, root_account):
     assert request['state'] == RequestState.FAILED
 
 
+@skip_rse_tests_with_accounts
+@pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
+@pytest.mark.parametrize("file_config_mock", [
+    {"overrides": [('oidc', 'admin_issuer', 'indigoiam')]},
+], indirect=True)
+def test_transfer_with_tokens(vo, did_factory, root_account, caches_mock, file_config_mock):
+    src_rse = 'WEB1'
+    src_rse_id = rse_core.get_rse_id(rse=src_rse, vo=vo)
+    dst_rse = 'XRD5'
+    dst_rse_id = rse_core.get_rse_id(rse=dst_rse, vo=vo)
+    all_rses = [src_rse_id, dst_rse_id]
+
+    did = did_factory.upload_test_file(src_rse)
+
+    rule_core.add_rule(dids=[did], account=root_account, copies=1, rse_expression=dst_rse, grouping='ALL', weight=None, lifetime=None, locked=False, subscription_id=None)
+
+    received_messages = {}
+
+    class ReceiverWrapper(Receiver):
+        """
+        Wrap receiver to record the last handled message for each given request_id
+        """
+        def _perform_request_update(self, msg, *, session=None, logger=logging.log):
+            ret = super()._perform_request_update(msg, session=session, logger=logger)
+            received_messages[msg['file_metadata']['request_id']] = msg
+            return ret
+
+    with patch('rucio.daemons.conveyor.receiver.Receiver', ReceiverWrapper):
+        receiver_thread = threading.Thread(target=receiver, kwargs={'id_': 0, 'all_vos': True, 'total_threads': 1})
+        receiver_thread.start()
+        try:
+            submitter(once=True, rses=[{'id': rse_id} for rse_id in all_rses], group_bulk=2, partition_wait_time=0, transfertype='single', filter_transfertool=None)
+            # Wait for the reception of the FTS Completion message for the submitted request
+            request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
+            for i in range(MAX_POLL_WAIT_SECONDS):
+                if request['id'] in received_messages:
+                    break
+                if i == MAX_POLL_WAIT_SECONDS - 1:
+                    assert False  # Waited too long; fail the test
+                time.sleep(1)
+            assert received_messages[request['id']]['job_metadata']['auth_method'] == 'oauth2'
+        finally:
+            receiver_graceful_stop.set()
+            receiver_thread.join(timeout=5)
+            receiver_graceful_stop.clear()
+
+
 @pytest.mark.noparallel(groups=[NoParallelGroups.PREPARER])
 @pytest.mark.parametrize("file_config_mock", [{
     "overrides": [('conveyor', 'use_preparer', 'true')]

{rucio-clients-33.3.0 → rucio-clients-33.4.0}/tests/test_reaper.py

@@ -36,7 +36,8 @@ from rucio.daemons.reaper.dark_reaper import reaper as dark_reaper
 from rucio.daemons.reaper.reaper import run as run_reaper
 from rucio.db.sqla.models import ConstituentAssociationHistory
 from rucio.db.sqla.session import read_session
-from rucio.tests.common import rse_name_generator
+from rucio.tests.common import rse_name_generator, skip_rse_tests_with_accounts
+from tests.ruciopytest import NoParallelGroups
 
 __mock_protocol = {'scheme': 'MOCK',
                    'hostname': 'localhost',
@@ -481,3 +482,21 @@ def test_reaper_without_rse_usage(vo, caches_mock):
     cache_region.invalidate()
     reaper(once=True, rses=[], include_rses=rse_name, exclude_rses=None, chunk_size=1000, scheme='MOCK')
     assert len(list(replica_core.list_replicas(dids, rse_expression=rse_name))) == nb_files - nb_epoch_tombstone
+
+
+@skip_rse_tests_with_accounts
+@pytest.mark.dirty(reason="leaves files in XRD containers")
+@pytest.mark.noparallel(groups=[NoParallelGroups.WEB])
+@pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
+    'rucio.daemons.reaper.reaper.REGION'
+]}], indirect=True)
+@pytest.mark.parametrize("file_config_mock", [
+    {"overrides": [('oidc', 'admin_issuer', 'indigoiam')]},
+], indirect=True)
+def test_deletion_with_tokens(vo, did_factory, root_account, caches_mock, file_config_mock):
+    rse_name = 'WEB1'
+    did = did_factory.upload_test_file(rse_name)
+    for rule in list(rule_core.list_associated_rules_for_file(**did)):
+        rule_core.delete_rule(rule['id'])
+
+    reaper(once=True, rses=[], include_rses=rse_name, exclude_rses=None, chunk_size=1000, greedy=True, scheme='davs')