Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Rucio
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Requirements
Jira
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Sylvain Blunier
Rucio
Commits
5fe1a93c
Commit
5fe1a93c
authored
9 years ago
by
Wen Guan
Browse files
Options
Downloads
Patches
Plain Diff
[
RUCIO-1613
] fix tape checking
Change-Id: Ic37f7c407c31d3e0af5347c3103f87616e706373
parent
80f4d0de
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/rucio/daemons/conveyor/submitter_utils.py
+13
-6
13 additions, 6 deletions
lib/rucio/daemons/conveyor/submitter_utils.py
with
13 additions
and
6 deletions
lib/rucio/daemons/conveyor/submitter_utils.py
+
13
−
6
View file @
5fe1a93c
...
...
@@ -702,7 +702,7 @@ def get_transfer_requests_and_source_replicas(process=None, total_processes=None
# DQ2 path always starts with /, but prefix might not end with /
naming_convention
=
rse_attrs
[
dest_rse_id
].
get
(
'
naming_convention
'
,
None
)
dest_path
=
construct_surl
(
dsn
,
name
,
naming_convention
)
if
rses_info
[
dest_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
:
if
rses_info
[
dest_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
or
rses_info
[
dest_rse_id
][
'
rse_type
'
]
==
'
TAPE
'
:
if
previous_attempt_id
or
activity
==
'
Recovery
'
:
dest_path
=
'
%s_%i
'
%
(
dest_path
,
int
(
time
.
time
()))
...
...
@@ -744,9 +744,9 @@ def get_transfer_requests_and_source_replicas(process=None, total_processes=None
# Extend the metadata dictionary with request attributes
overwrite
,
bring_online
=
True
,
None
if
rses_info
[
source_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
:
if
rses_info
[
source_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
or
rses_info
[
source_rse_id
][
'
rse_type
'
]
==
'
TAPE
'
:
bring_online
=
172800
# 48 hours
if
rses_info
[
dest_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
:
if
rses_info
[
dest_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
or
rses_info
[
dest_rse_id
][
'
rse_type
'
]
==
'
TAPE
'
:
overwrite
=
False
# get external_host
...
...
@@ -806,7 +806,7 @@ def get_transfer_requests_and_source_replicas(process=None, total_processes=None
# TAPE should not mixed with Disk and should not use as first try
# If there is a source whose ranking is more than 0, Tape will not be used.
if
rses_info
[
source_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
:
if
rses_info
[
source_rse_id
][
'
rse_type
'
]
==
RSEType
.
TAPE
or
rses_info
[
source_rse_id
][
'
rse_type
'
]
==
'
TAPE
'
:
# current src_rse is Tape
if
not
transfers
[
id
][
'
bring_online
'
]:
# the founded sources are disks.
...
...
@@ -932,6 +932,13 @@ def get_stagein_requests_and_source_replicas(process=None, total_processes=None,
if
source_rse_id
is
None
or
rse
is
None
or
staging_buffer
is
None
:
continue
attr
=
None
if
attributes
:
if
type
(
attributes
)
is
dict
:
attr
=
json
.
loads
(
json
.
dumps
(
attributes
))
else
:
attr
=
json
.
loads
(
str
(
attributes
))
# to get space token and fts attribute
if
source_rse_id
not
in
rses_info
:
# source_rse = rse_core.get_rse_name(rse_id=source_rse_id, session=session)
...
...
@@ -969,7 +976,7 @@ def get_stagein_requests_and_source_replicas(process=None, total_processes=None,
'
name
'
:
name
,
'
activity
'
:
activity
,
'
src_rse
'
:
rse
,
'
dst_rse
'
:
rse
s_info
[
dest_rse_id
][
'
rse
'
]
,
'
dst_rse
'
:
rse
,
'
dest_rse_id
'
:
dest_rse_id
,
'
filesize
'
:
bytes
,
'
md5
'
:
md5
,
...
...
@@ -985,7 +992,7 @@ def get_stagein_requests_and_source_replicas(process=None, total_processes=None,
'
dest_spacetoken
'
:
dest_spacetoken
,
'
overwrite
'
:
False
,
'
bring_online
'
:
172800
,
# 48 hours
'
copy_pin_lifetime
'
:
attr
.
get
(
'
lifetime
'
,
-
1
),
'
copy_pin_lifetime
'
:
attr
.
get
(
'
lifetime
'
,
-
1
)
if
attr
else
-
1
,
'
external_host
'
:
external_host
,
'
selection_strategy
'
:
'
auto
'
,
'
rule_id
'
:
rule_id
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment