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
ee1af1b9
Commit
ee1af1b9
authored
7 years ago
by
Eric Cano
Browse files
Options
Downloads
Patches
Plain Diff
Fixed reportTime printed in the wrong place in MigrationReportPacker::ReportFlush.
Also added more information to the logs.
parent
1d7de14f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.cpp
+13
-6
13 additions, 6 deletions
...r/castor/tape/tapeserver/daemon/MigrationReportPacker.cpp
with
13 additions
and
6 deletions
tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.cpp
+
13
−
6
View file @
ee1af1b9
...
...
@@ -292,8 +292,7 @@ void MigrationReportPacker::ReportFlush::checkAndAsyncReportCompletedJobs(
"In MigrationReportPacker::ReportFlush::checkAndAsyncReportCompletedJobs()"
" check for async backend update finished"
);
if
(
job
->
checkAndAsyncReportComplete
())
{
params
.
add
(
"reportURL"
,
job
->
reportURL
())
.
add
(
"reportTime"
,
job
->
reportTime
());
params
.
add
(
"reportURL"
,
job
->
reportURL
());
reportedArchiveJobs
.
emplace_back
(
std
::
move
(
job
));
logContext
.
log
(
cta
::
log
::
INFO
,
"Sent to the client a full file archival"
);
}
else
{
...
...
@@ -305,13 +304,21 @@ void MigrationReportPacker::ReportFlush::checkAndAsyncReportCompletedJobs(
try
{
job
->
waitForReporting
();
// should not be a deadWait as soon as we have a timeout on the xroot query
cta
::
log
::
ScopedParamContainer
params
(
logContext
);
params
.
add
(
"reportURL"
,
job
->
reportURL
())
.
add
(
"lastKnownDiskPath"
,
job
->
archiveFile
.
diskFileInfo
.
path
);
params
.
add
(
"fileId"
,
job
->
archiveFile
.
archiveFileID
)
.
add
(
"diskInstance"
,
job
->
archiveFile
.
diskInstance
)
.
add
(
"diskFileId"
,
job
->
archiveFile
.
diskFileId
)
.
add
(
"lastKnownDiskPath"
,
job
->
archiveFile
.
diskFileInfo
.
path
)
.
add
(
"reportURL"
,
job
->
reportURL
())
.
add
(
"lastKnownDiskPath"
,
job
->
archiveFile
.
diskFileInfo
.
path
)
.
add
(
"reportTime"
,
job
->
reportTime
());
logContext
.
log
(
cta
::
log
::
INFO
,
"Reported to the client a full file archival"
);
}
catch
(
cta
::
exception
::
Exception
&
ex
)
{
cta
::
log
::
ScopedParamContainer
params
(
logContext
);
params
.
add
(
"reportURL"
,
job
->
reportURL
());
params
.
add
(
"errorMessage"
,
ex
.
getMessage
().
str
());
params
.
add
(
"fileId"
,
job
->
archiveFile
.
archiveFileID
)
.
add
(
"diskInstance"
,
job
->
archiveFile
.
diskInstance
)
.
add
(
"diskFileId"
,
job
->
archiveFile
.
diskFileId
)
.
add
(
"lastKnownDiskPath"
,
job
->
archiveFile
.
diskFileInfo
.
path
).
add
(
"reportURL"
,
job
->
reportURL
())
.
add
(
"errorMessage"
,
ex
.
getMessage
().
str
());
logContext
.
log
(
cta
::
log
::
ERR
,
"Unsuccessful report to the client a full file archival:"
);
}
catch
(...)
{
throw
;
...
...
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