Skip to content

Commit

Permalink
Transfers: fix fts argument for scitag
Browse files Browse the repository at this point in the history
  • Loading branch information
Radu Carpa committed Oct 18, 2023
1 parent 6a5ccae commit d6e70be
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/rucio/transfertool/fts3.py
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ def _file_from_transfer(self, transfer, job_params):
if isinstance(self.scitags_exp_id, int):
activity_id = self.scitags_activity_ids.get(rws.activity)
if isinstance(activity_id, int):
t_file['metadata']['scitags_id'] = self.scitags_exp_id << 6 | activity_id
t_file['scitag'] = self.scitags_exp_id << 6 | activity_id
return t_file

def submit(self, transfers, job_params, timeout=None):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_conveyor.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock
fts_response = FTS3Transfertool(external_host=TEST_FTS_HOST).bulk_query({request['external_id']: {request['id']: request}})
fts_response = fts_response[request['external_id']][request['id']]
assert fts_response.job_response['priority'] == rule_priority
assert fts_response.file_response['file_metadata'].get('scitags_id') is not None
assert fts_response.file_response.get('scitag') is not None

# Two hops; both handled by receiver
assert metrics_mock.get_sample_value('rucio_daemons_conveyor_receiver_update_request_state_total', labels={'updated': 'True'}) >= 2
Expand Down

0 comments on commit d6e70be

Please sign in to comment.