From 5a0d8e36766fe58198401a386a791a37e8b09b47 Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Fri, 20 Sep 2019 14:05:42 +0200
Subject: [PATCH] Lowered log level where not useful.
Avoided counting an error for files hitting end of tape.
---
objectstore/BackendPopulator.cpp | 2 +-
tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/objectstore/BackendPopulator.cpp b/objectstore/BackendPopulator.cpp
index 7c6d84ceb5..7ccecc4b8c 100644
--- a/objectstore/BackendPopulator.cpp
+++ b/objectstore/BackendPopulator.cpp
@@ -70,7 +70,7 @@ BackendPopulator::~BackendPopulator() throw() {
agent.commit();
params.add("agentObject", agent.getAddressIfSet())
.add("ownedObjectCount", agent.getOwnershipList().size());
- m_lc.log(log::WARNING, "In BackendPopulator::~BackendPopulator(): not deleting non-empty agent object, left for garbage collection.");
+ m_lc.log(log::INFO, "In BackendPopulator::~BackendPopulator(): not deleting non-empty agent object, left for garbage collection.");
return;
}
agent.removeAndUnregisterSelf(m_lc);
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp
index ea9af35ed7..c0acfb7d2f 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp
@@ -236,19 +236,21 @@ namespace daemon {
// We also change the log level to INFO for the case of end of tape.
int errorCode = 666; // TODO - Remove error code
int errorLevel = cta::log::ERR;
+ bool doReportJobError = true;
try {
const cta::exception::Errnum & errnum =
dynamic_cast<const cta::exception::Errnum &> (e);
if (ENOSPC == errnum.errorNumber()) {
errorCode = ENOSPC;
errorLevel = cta::log::INFO;
+ doReportJobError = false;
}
} catch (...) {}
LogContext::ScopedParam sp(lc, Param("exceptionCode",errorCode));
LogContext::ScopedParam sp1(lc, Param("exceptionMessage", e.getMessageValue()));
lc.log(errorLevel,"An error occurred for this file. End of migrations.");
circulateMemBlocks();
- reportPacker.reportFailedJob(std::move(m_archiveJob),e, lc);
+ if (doReportJobError) reportPacker.reportFailedJob(std::move(m_archiveJob),e, lc);
//we throw again because we want TWST to stop all tasks from execution
//and go into a degraded mode operation.
--
GitLab