Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
0c5d2e5a
Commit
0c5d2e5a
authored
Nov 26, 2014
by
Eric Cano
Browse files
Fixed mixed-up and missing end of session statuses.
parent
7f48c7db
Changes
3
Hide whitespace changes
Inline
Side-by-side
castor/tape/tapeserver/daemon/CatalogueTransferSession.cpp
View file @
0c5d2e5a
...
...
@@ -259,7 +259,7 @@ void castor::tape::tapeserver::daemon::CatalogueTransferSession::
void
castor
::
tape
::
tapeserver
::
daemon
::
CatalogueTransferSession
::
sessionFailed
()
{
// In case of problem, we mark the session failed ourselves
m_sessionLogContext
.
pushOrReplace
(
log
::
Param
(
"status"
,
"faile
d
"
));
m_sessionLogContext
.
pushOrReplace
(
log
::
Param
(
"status"
,
"fail
ur
e"
));
m_sessionLogContext
.
log
(
LOG_INFO
,
"Tape session finished"
);
}
...
...
castor/tape/tapeserver/daemon/MigrationReportPacker.cpp
View file @
0c5d2e5a
...
...
@@ -248,7 +248,7 @@ void MigrationReportPacker::ReportEndofSession::execute(MigrationReportPacker& r
.
add
(
"transactionId"
,
chrono
.
transactionId
);
reportPacker
.
m_lc
.
log
(
LOG_INFO
,
"Reported end of session to client"
);
if
(
reportPacker
.
m_watchdog
)
{
reportPacker
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"
failure
"
));
reportPacker
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"
success
"
));
}
}
else
{
...
...
@@ -263,7 +263,7 @@ void MigrationReportPacker::ReportEndofSession::execute(MigrationReportPacker& r
.
add
(
"transactionId"
,
chrono
.
transactionId
);
reportPacker
.
m_lc
.
log
(
LOG_ERR
,
"Reported end of session with error to client due to previous file errors"
);
if
(
reportPacker
.
m_watchdog
)
{
reportPacker
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"
success
"
));
reportPacker
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"
failure
"
));
}
}
reportPacker
.
m_continue
=
false
;
...
...
castor/tape/tapeserver/daemon/RecallReportPacker.cpp
View file @
0c5d2e5a
...
...
@@ -154,7 +154,7 @@ void RecallReportPacker::ReportEndofSession::execute(RecallReportPacker& parent)
parent
.
m_client
.
reportEndOfSession
(
chrono
);
parent
.
logRequestReport
(
chrono
,
"Nominal RecallReportPacker::EndofSession has been reported"
,
LOG_INFO
);
if
(
parent
.
m_watchdog
)
{
parent
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"
failure
"
));
parent
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"
success
"
));
}
}
else
{
...
...
@@ -162,6 +162,9 @@ void RecallReportPacker::ReportEndofSession::execute(RecallReportPacker& parent)
parent
.
m_lc
.
log
(
LOG_ERR
,
msg
);
parent
.
m_client
.
reportEndOfSessionWithError
(
msg
,
SEINTERNAL
,
chrono
);
parent
.
logRequestReport
(
chrono
,
"reporting EndOfSessionWithError done"
,
LOG_ERR
);
if
(
parent
.
m_watchdog
)
{
parent
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"failure"
));
}
}
}
//------------------------------------------------------------------------------
...
...
@@ -179,6 +182,9 @@ void RecallReportPacker::ReportEndofSessionWithErrors::execute(RecallReportPacke
parent
.
m_lc
.
log
(
LOG_ERR
,
msg
);
parent
.
m_client
.
reportEndOfSessionWithError
(
msg
,
SEINTERNAL
,
chrono
);
}
if
(
parent
.
m_watchdog
)
{
parent
.
m_watchdog
->
addParameter
(
log
::
Param
(
"status"
,
"failure"
));
}
}
//------------------------------------------------------------------------------
//ReportError::execute
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment