From 3c7c4e3fa71493c1a9c63c3e3bfdc0b5a9715d44 Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Tue, 18 Dec 2018 10:02:31 +0100
Subject: [PATCH] Changed log param name to tapeVid in recently modified code.
---
objectstore/RetrieveQueueAlgorithms.hpp | 10 +++++-----
objectstore/RetrieveQueueFailedAlgorithms.cpp | 2 +-
objectstore/RetrieveQueueToReportAlgorithms.cpp | 2 +-
objectstore/RetrieveQueueToTransferAlgorithms.cpp | 2 +-
objectstore/RetrieveRequest.cpp | 2 +-
scheduler/OStoreDB/OStoreDB.cpp | 6 +++---
scheduler/Scheduler.cpp | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/objectstore/RetrieveQueueAlgorithms.hpp b/objectstore/RetrieveQueueAlgorithms.hpp
index 299b75ad54..f93dfb3deb 100644
--- a/objectstore/RetrieveQueueAlgorithms.hpp
+++ b/objectstore/RetrieveQueueAlgorithms.hpp
@@ -243,19 +243,19 @@ retry:
try {
re.removeRetrieveQueueAndCommit(cId, queueType, lc);
log::ScopedParamContainer params(lc);
- params.add("vid", cId)
+ params.add("tapeVid", cId)
.add("queueObject", cont.getAddressIfSet());
lc.log(log::INFO, "In ContainerTraits<RetrieveQueue,C>::getLockedAndFetchedNoCreate(): dereferenced missing queue from root entry");
} catch (RootEntry::RetrieveQueueNotEmpty &ex) {
log::ScopedParamContainer params(lc);
- params.add("vid", cId)
+ params.add("tapeVid", cId)
.add("queueObject", cont.getAddressIfSet())
.add("Message", ex.getMessageValue());
lc.log(log::INFO, "In ContainerTraits<RetrieveQueue,C>::getLockedAndFetchedNoCreate(): could not dereference missing queue from root entry");
} catch (RootEntry::NoSuchRetrieveQueue &ex) {
// Somebody removed the queue in the meantime. Barely worth mentioning.
log::ScopedParamContainer params(lc);
- params.add("vid", cId)
+ params.add("tapeVid", cId)
.add("queueObject", cont.getAddressIfSet());
lc.log(log::DEBUG, "In ContainerTraits<RetrieveQueue,C>::getLockedAndFetchedNoCreate(): could not dereference missing queue from root entry: already done.");
}
@@ -403,12 +403,12 @@ trimContainerIfNeeded(Container &cont, QueueType queueType, ScopedExclusiveLock
re.fetch();
re.removeRetrieveQueueAndCommit(cId, queueType, lc);
log::ScopedParamContainer params(lc);
- params.add("vid", cId)
+ params.add("tapeVid", cId)
.add("queueObject", cont.getAddressIfSet());
lc.log(log::INFO, "In ContainerTraits<RetrieveQueue,C>::trimContainerIfNeeded(): deleted empty queue");
} catch(cta::exception::Exception &ex) {
log::ScopedParamContainer params(lc);
- params.add("vid", cId)
+ params.add("tapeVid", cId)
.add("queueObject", cont.getAddressIfSet())
.add("Message", ex.getMessageValue());
lc.log(log::INFO, "In ContainerTraits<RetrieveQueue,C>::trimContainerIfNeeded(): could not delete a presumably empty queue");
diff --git a/objectstore/RetrieveQueueFailedAlgorithms.cpp b/objectstore/RetrieveQueueFailedAlgorithms.cpp
index ee45537924..d8892c7a3d 100644
--- a/objectstore/RetrieveQueueFailedAlgorithms.cpp
+++ b/objectstore/RetrieveQueueFailedAlgorithms.cpp
@@ -24,7 +24,7 @@ template<>
const std::string ContainerTraits<RetrieveQueue,RetrieveQueueFailed>::c_containerTypeName = "RetrieveQueueFailed";
template<>
-const std::string ContainerTraits<RetrieveQueue,RetrieveQueueFailed>::c_identifierType = "vid";
+const std::string ContainerTraits<RetrieveQueue,RetrieveQueueFailed>::c_identifierType = "tapeVid";
template<>
auto ContainerTraits<RetrieveQueue,RetrieveQueueFailed>::
diff --git a/objectstore/RetrieveQueueToReportAlgorithms.cpp b/objectstore/RetrieveQueueToReportAlgorithms.cpp
index 4ab625f838..421267836b 100644
--- a/objectstore/RetrieveQueueToReportAlgorithms.cpp
+++ b/objectstore/RetrieveQueueToReportAlgorithms.cpp
@@ -24,7 +24,7 @@ template<>
const std::string ContainerTraits<RetrieveQueue,RetrieveQueueToReport>::c_containerTypeName = "RetrieveQueueToReport";
template<>
-const std::string ContainerTraits<RetrieveQueue,RetrieveQueueToReport>::c_identifierType = "vid";
+const std::string ContainerTraits<RetrieveQueue,RetrieveQueueToReport>::c_identifierType = "tapeVid";
template<>
auto ContainerTraits<RetrieveQueue,RetrieveQueueToReport>::
diff --git a/objectstore/RetrieveQueueToTransferAlgorithms.cpp b/objectstore/RetrieveQueueToTransferAlgorithms.cpp
index a4b2c5d9f0..01454a0947 100644
--- a/objectstore/RetrieveQueueToTransferAlgorithms.cpp
+++ b/objectstore/RetrieveQueueToTransferAlgorithms.cpp
@@ -24,7 +24,7 @@ template<>
const std::string ContainerTraits<RetrieveQueue,RetrieveQueueToTransfer>::c_containerTypeName = "RetrieveQueueToTransfer";
template<>
-const std::string ContainerTraits<RetrieveQueue,RetrieveQueueToTransfer>::c_identifierType = "vid";
+const std::string ContainerTraits<RetrieveQueue,RetrieveQueueToTransfer>::c_identifierType = "tapeVid";
template<>
auto ContainerTraits<RetrieveQueue,RetrieveQueueToTransfer>::
diff --git a/objectstore/RetrieveRequest.cpp b/objectstore/RetrieveRequest.cpp
index 1815562742..eaca44a916 100644
--- a/objectstore/RetrieveRequest.cpp
+++ b/objectstore/RetrieveRequest.cpp
@@ -119,7 +119,7 @@ queueForFailure:;
.add("copyNb", j.copynb());
for (auto &tf: m_payload.archivefile().tapefiles()) {
if (tf.copynb() == j.copynb()) {
- params.add("vid", tf.vid())
+ params.add("tapeVid", tf.vid())
.add("fSeq", tf.fseq());
break;
}
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index afeb812d5c..2f33de5986 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -2372,7 +2372,7 @@ void OStoreDB::ArchiveMount::setJobBatchTransferred(std::list<std::unique_ptr<ct
insertedElementsLists[j->tapeFile.vid].emplace_back(AqtrCa::InsertedElement{&j->m_archiveRequest, j->tapeFile.copyNb,
j->archiveFile, cta::nullopt, cta::nullopt});
log::ScopedParamContainer params (lc);
- params.add("VID", j->tapeFile.vid)
+ params.add("tapeVid", j->tapeFile.vid)
.add("fileId", j->archiveFile.archiveFileID)
.add("requestObject", j->m_archiveRequest.getAddressIfSet());
lc.log(log::INFO, "In OStoreDB::ArchiveMount::setJobBatchTransferred(): will queue request for reporting.");
@@ -2383,13 +2383,13 @@ void OStoreDB::ArchiveMount::setJobBatchTransferred(std::list<std::unique_ptr<ct
aqtrCa.referenceAndSwitchOwnership(list.first, JobQueueType::JobsToReport, m_oStoreDB.m_agentReference->getAgentAddress(),
list.second, lc);
log::ScopedParamContainer params(lc);
- params.add("VID", list.first)
+ params.add("tapeVid", list.first)
.add("jobs", list.second.size())
.add("enqueueTime", t.secs());
lc.log(log::INFO, "In OStoreDB::ArchiveMount::setJobBatchTransferred(): queued a batch of requests for reporting.");
} catch (cta::exception::Exception & ex) {
log::ScopedParamContainer params(lc);
- params.add("VID", list.first)
+ params.add("tapeVid", list.first)
.add("exceptionMSG", ex.getMessageValue());
lc.log(log::ERR, "In OStoreDB::ArchiveMount::setJobBatchTransferred(): failed to queue a batch of requests for reporting.");
}
diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index 55ab2ae4ae..141a0dd29b 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -303,7 +303,7 @@ void Scheduler::queueRepack(const common::dataStructures::SecurityIdentity &cliI
log::TimingList tl;
tl.insertAndReset("schedulerDbTime", t);
log::ScopedParamContainer params(lc);
- params.add("VID", vid)
+ params.add("tapeVid", vid)
.add("repackType", toString(repackType));
tl.addToLog(params);
lc.log(log::INFO, "In Scheduler::queueRepack(): success.");
--
GitLab