From e6ecdac01b46f15ad0f1ae1d7c801224d392a8b5 Mon Sep 17 00:00:00 2001
From: Jorge Camarero Vera <jorge.camarero@cern.ch>
Date: Fri, 14 Oct 2022 14:13:47 +0200
Subject: [PATCH] Change RecallTaskInjector::reserveSpaceForNextJobBatch error
to warning
---
ReleaseNotes.md | 1 +
.../tapeserver/daemon/RecallTaskInjector.cpp | 27 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 4a54f2ccf5..1e77761f52 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -7,6 +7,7 @@
- cta/CTA#173 - Update release notes and small changes to refactoring of operation tools cmd line parsing - Compatible with operations 0.4-95 or later
### Bug fixes
- cta/CTA#48 - Catch tape server exception and log an error instead
+- cta/CTA#123 - Change some tape server errors into warnings
- cta/CTA#161 - Fix bug when using temporary tables with PostgreSQL
# v4.7.12-1
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
index 111718807a..6f256409b9 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
@@ -159,19 +159,18 @@ bool RecallTaskInjector::testDiskSpaceReservationWorking() {
}
//------------------------------------------------------------------------------
-//reserveSpaceForNextJobBatch
+// reserveSpaceForNextJobBatch
//------------------------------------------------------------------------------
-bool RecallTaskInjector::reserveSpaceForNextJobBatch(std::list<std::unique_ptr<cta::RetrieveJob>> &nextJobBatch) {
-
+bool RecallTaskInjector::reserveSpaceForNextJobBatch(std::list<std::unique_ptr<cta::RetrieveJob>> &nextJobBatch) {
cta::DiskSpaceReservationRequest diskSpaceReservation;
- for (auto &job: nextJobBatch) {
+ for (auto &job : nextJobBatch) {
auto diskSystemName = job->diskSystemName();
if (diskSystemName) {
diskSpaceReservation.addRequest(diskSystemName.value(), job->archiveFile.fileSize);
- }
+ }
}
- for (const auto &reservation: diskSpaceReservation) {
+ for (const auto &reservation : diskSpaceReservation) {
cta::log::ScopedParamContainer spc(m_lc);
spc.add("diskSystemName", reservation.first);
spc.add("bytes", reservation.second);
@@ -182,28 +181,28 @@ bool RecallTaskInjector::reserveSpaceForNextJobBatch(std::list<std::unique_ptr<c
try {
ret = m_retrieveMount.reserveDiskSpace(diskSpaceReservation, m_lc);
} catch (std::out_of_range&) {
- //#1076 If the disk system for this mount was removed, process the jobs as if they had no disk system
+ // #1076 If the disk system for this mount was removed, process the jobs as if they had no disk system
// (assuming only one disk system per mount)
- for (auto &job: nextJobBatch) {
+ for (auto &job : nextJobBatch) {
job->diskSystemName() = std::nullopt;
}
m_lc.log(cta::log::WARNING,
- "In RecallTaskInjector::reserveSpaceForNextJobBatch(): Disk sapce reservation failed "
+ "In RecallTaskInjector::reserveSpaceForNextJobBatch(): Disk space reservation failed "
"because disk system configuration has been removed, processing job batch as if it had no disk system");
return true;
}
- if(!ret) {
- for(auto &jobptr: nextJobBatch) {
+ if (!ret) {
+ for (auto &jobptr : nextJobBatch) {
m_jobs.push_back(std::unique_ptr<cta::RetrieveJob>(jobptr.release()));
}
m_retrieveMount.requeueJobBatch(m_jobs, m_lc);
m_files = 0;
m_bytes = 0;
- m_lc.log(cta::log::ERR, "In RecallTaskInjector::reserveSpaceForNextJobBatch(): Disk space reservation failed, requeued all pending jobs");
+ m_lc.log(cta::log::WARNING, "In RecallTaskInjector::reserveSpaceForNextJobBatch(): Disk space reservation failed, "
+ "requeued all pending jobs");
m_diskSpaceReservationFailed = true;
- }
- else {
+ } else {
m_lc.log(cta::log::INFO, "In RecallTaskInjector::reserveSpaceForNextJobBatch(): Disk space reservation for next job batch succeeded");
}
return ret;
--
GitLab