Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
e315befd
Commit
e315befd
authored
3 years ago
by
Jorge Camarero Vera
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "fix STALE message when cta-taped is restarting"
parent
e1e18770
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ReleaseNotes.md
+1
-0
1 addition, 0 deletions
ReleaseNotes.md
scheduler/TapeDrivesCatalogueState.cpp
+9
-3
9 additions, 3 deletions
scheduler/TapeDrivesCatalogueState.cpp
xroot_plugins/XrdCtaDriveLs.hpp
+1
-1
1 addition, 1 deletion
xroot_plugins/XrdCtaDriveLs.hpp
with
11 additions
and
4 deletions
ReleaseNotes.md
+
1
−
0
View file @
e315befd
...
...
@@ -14,6 +14,7 @@
-
cta/CTA#1059 - Clean up warnings reported by static analysis
-
cta/CTA#1062 - cta-admin tf rm should store the diskFilePath when deleting the tape file copy
-
cta/CTA#1073 - Retry failed reporting for archive jobs
-
cta/CTA#1078 - fix STALE message when cta-taped is restarting
# v4.3-3
...
...
This diff is collapsed.
Click to expand it.
scheduler/TapeDrivesCatalogueState.cpp
+
9
−
3
View file @
e315befd
...
...
@@ -619,7 +619,7 @@ common::dataStructures::TapeDrive TapeDrivesCatalogueState::setTapeDriveStatus(
const
common
::
dataStructures
::
DesiredDriveState
&
desiredState
,
const
common
::
dataStructures
::
MountType
&
type
,
const
common
::
dataStructures
::
DriveStatus
&
status
,
const
tape
::
daemon
::
TpconfigLine
&
tpConfigLine
,
const
common
::
dataStructures
::
SecurityIdentity
&
identity
)
{
const
time_t
reportTime
=
time
(
NULL
);
const
time_t
reportTime
=
time
(
nullptr
);
common
::
dataStructures
::
TapeDrive
tapeDriveStatus
;
tapeDriveStatus
.
driveName
=
driveInfo
.
driveName
;
tapeDriveStatus
.
host
=
driveInfo
.
host
;
...
...
@@ -636,8 +636,14 @@ common::dataStructures::TapeDrive TapeDrivesCatalogueState::setTapeDriveStatus(
tapeDriveStatus
.
reservedBytes
=
0
;
tapeDriveStatus
.
devFileName
=
tpConfigLine
.
devFilename
;
tapeDriveStatus
.
rawLibrarySlot
=
tpConfigLine
.
rawLibrarySlot
;
tapeDriveStatus
.
creationLog
=
common
::
dataStructures
::
EntryLog
(
identity
.
username
,
identity
.
host
,
reportTime
);
tapeDriveStatus
.
lastModificationLog
=
common
::
dataStructures
::
EntryLog
(
identity
.
username
,
identity
.
host
,
reportTime
);
if
(
identity
.
username
.
empty
())
{
tapeDriveStatus
.
creationLog
=
common
::
dataStructures
::
EntryLog
(
"NO_USER"
,
driveInfo
.
host
,
reportTime
);
tapeDriveStatus
.
lastModificationLog
=
common
::
dataStructures
::
EntryLog
(
"NO_USER"
,
driveInfo
.
host
,
reportTime
);
}
else
{
tapeDriveStatus
.
creationLog
=
common
::
dataStructures
::
EntryLog
(
identity
.
username
,
identity
.
host
,
reportTime
);
tapeDriveStatus
.
lastModificationLog
=
common
::
dataStructures
::
EntryLog
(
identity
.
username
,
identity
.
host
,
reportTime
);
}
return
tapeDriveStatus
;
}
...
...
This diff is collapsed.
Click to expand it.
xroot_plugins/XrdCtaDriveLs.hpp
+
1
−
1
View file @
e315befd
...
...
@@ -127,7 +127,7 @@ int DriveLsStream::fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf) {
else
dr_item
->
set_latest_bandwidth
(
0
);
dr_item
->
set_session_id
(
dr
.
sessionId
?
dr
.
sessionId
.
value
()
:
0
);
const
auto
lastUpdateTime
=
dr
.
lastModificationLog
?
dr
.
lastModificationLog
.
value
().
time
:
0
;
const
auto
lastUpdateTime
=
dr
.
lastModificationLog
?
dr
.
lastModificationLog
.
value
().
time
:
time
(
nullptr
)
;
dr_item
->
set_time_since_last_update
(
time
(
nullptr
)
-
lastUpdateTime
);
dr_item
->
set_current_priority
(
dr
.
currentPriority
?
dr
.
currentPriority
.
value
()
:
0
);
dr_item
->
set_current_activity
(
dr
.
currentActivity
?
dr
.
currentActivity
.
value
()
:
""
);
...
...
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