forked from rucio/rucio
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clients: correctly propagate selected domain in uploadclient. rucio#4639
The upload client has some logic to select the 'lan' domain if the client and rse 'site' are identical. This results into correctly selecting the `scheme` which can be used for a lan transfer. However, the domain is not enforced when the protocol object is latter created. This will result in using the default "wan" domain for the upload if a protocol with the same scheme is available on wan.
- Loading branch information
Showing
2 changed files
with
83 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright 2021 CERN | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| # Authors: | ||
| # - Radu Carpa <radu.carpa@cern.ch>, 2021 | ||
|
|
||
| import json | ||
| import os | ||
| from rucio.common.utils import generate_uuid | ||
| from rucio.tests.common import file_generator | ||
| from rucio.core.rse import add_protocol, add_rse_attribute | ||
|
|
||
| def test_multiple_protocols_same_scheme(rse_factory, did_factory, mock_scope, tmp_path): | ||
| """ Upload (CLIENT): Ensure domain correctly selected when multiple protocols exist with the same scheme """ | ||
|
|
||
| rse, rse_id = rse_factory.make_rse() | ||
|
|
||
| # Ensure client site and rse site are identical. So that "lan" is preferred. | ||
| add_rse_attribute(rse_id, 'site', 'ROAMING') | ||
|
|
||
| add_protocol(rse_id, {'scheme': 'file', | ||
| 'hostname': 'file-wan.aperture.com', | ||
| 'port': 0, | ||
| 'prefix': '/prefix1/', | ||
| 'impl': 'rucio.rse.protocols.posix.Default', | ||
| 'domains': { | ||
| 'lan': {'read': 0, 'write': 0, 'delete': 0}, | ||
| 'wan': {'read': 1, 'write': 1, 'delete': 1}}}) | ||
| add_protocol(rse_id, {'scheme': 'file', | ||
| 'hostname': 'file-lan.aperture.com', | ||
| 'port': 0, | ||
| 'prefix': '/prefix2/', | ||
| 'impl': 'rucio.rse.protocols.posix.Default', | ||
| 'domains': { | ||
| 'lan': {'read': 1, 'write': 1, 'delete': 1}, | ||
| 'wan': {'read': 0, 'write': 0, 'delete': 0}}}) | ||
| add_protocol(rse_id, {'scheme': 'root', | ||
| 'hostname': 'root.aperture.com', | ||
| 'port': 1403, | ||
| 'prefix': '/prefix3/', | ||
| 'impl': 'rucio.rse.protocols.xrootd.Default', | ||
| 'domains': { | ||
| 'lan': {'read': 2, 'write': 2, 'delete': 2}, | ||
| 'wan': {'read': 2, 'write': 2, 'delete': 2}}}) | ||
|
|
||
|
|
||
| # Upload a file | ||
| path = file_generator() | ||
| name = os.path.basename(path) | ||
| item = { | ||
| 'path': path, | ||
| 'rse': rse, | ||
| 'did_scope': str(mock_scope), | ||
| 'did_name': name, | ||
| 'guid': generate_uuid(), | ||
| } | ||
| summary_path = tmp_path / 'summary' | ||
| did_factory.upload_client.upload([item], summary_file_path=summary_path) | ||
|
|
||
| # Verify that the lan protocol was used for the upload | ||
| with open(summary_path) as json_file: | ||
| data = json.load(json_file) | ||
| assert 'file-lan.aperture.com' in data['{}:{}'.format(mock_scope, name)]['pfn'] |