Skip to content
Snippets Groups Projects
Commit 492219c2 authored by Michael Davis's avatar Michael Davis
Browse files

[frontend] Adds failure log messages to processCLOSEW()

parent 6cf1afa7
No related branches found
No related tags found
No related merge requests found
- cta/CTA#964 Adds failure log messages to processCLOSEW in CTA Frontend
# v3.2-1 # v3.2-1
## Summary ## Summary
......
...@@ -504,23 +504,31 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification &notification, c ...@@ -504,23 +504,31 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification &notification, c
request.creationLog.username = m_cliIdentity.username; request.creationLog.username = m_cliIdentity.username;
request.creationLog.time = time(nullptr); request.creationLog.time = time(nullptr);
cta::log::ScopedParamContainer params(m_lc);
params.add("requesterInstance", notification.wf().requester_instance());
std::string logMessage = "In RequestMessage::processCLOSEW(): ";
// CTA Archive ID is an EOS extended attribute, i.e. it is stored as a string, which // CTA Archive ID is an EOS extended attribute, i.e. it is stored as a string, which
// must be converted to a valid uint64_t // must be converted to a valid uint64_t
const auto archiveFileIdItor = notification.file().xattr().find("sys.archive.file_id"); const auto archiveFileIdItor = notification.file().xattr().find("sys.archive.file_id");
if(notification.file().xattr().end() == archiveFileIdItor) { if(notification.file().xattr().end() == archiveFileIdItor) {
logMessage += "sys.archive.file_id is not present in extended attributes";
m_lc.log(cta::log::INFO, logMessage);
throw PbException(std::string(__FUNCTION__) + ": Failed to find the extended attribute named sys.archive.file_id"); throw PbException(std::string(__FUNCTION__) + ": Failed to find the extended attribute named sys.archive.file_id");
} }
const std::string archiveFileIdStr = archiveFileIdItor->second; const std::string archiveFileIdStr = archiveFileIdItor->second;
uint64_t archiveFileId = 0; uint64_t archiveFileId = 0;
if((archiveFileId = strtoul(archiveFileIdStr.c_str(), nullptr, 10)) == 0) if((archiveFileId = strtoul(archiveFileIdStr.c_str(), nullptr, 10)) == 0)
{ {
params.add("sys.archive.file_id", archiveFileIdStr);
logMessage += "sys.archive.file_id is not a positive integer";
m_lc.log(cta::log::INFO, logMessage);
throw PbException("Invalid archiveFileID " + archiveFileIdStr); throw PbException("Invalid archiveFileID " + archiveFileIdStr);
} }
params.add("fileId", archiveFileId);
cta::utils::Timer t; cta::utils::Timer t;
cta::log::ScopedParamContainer params(m_lc);
std::string logMessage = "In RequestMessage::processCLOSEW(): ";
if(request.fileSize > 0) { if(request.fileSize > 0) {
// Queue the request // Queue the request
std::string archiveRequestAddr = m_scheduler.queueArchiveWithGivenId(archiveFileId, m_cliIdentity.username, request, m_lc); std::string archiveRequestAddr = m_scheduler.queueArchiveWithGivenId(archiveFileId, m_cliIdentity.username, request, m_lc);
...@@ -535,8 +543,6 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification &notification, c ...@@ -535,8 +543,6 @@ void RequestMessage::processCLOSEW(const cta::eos::Notification &notification, c
} }
// Create a log entry // Create a log entry
params.add("fileId", archiveFileId);
params.add("requesterInstance", notification.wf().requester_instance());
m_lc.log(cta::log::INFO, logMessage); m_lc.log(cta::log::INFO, logMessage);
// Set response type // Set response type
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment