From 3aed06f78ceb35ce50c6db29199d57c7346a3a98 Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Wed, 6 Mar 2019 15:16:50 +0100
Subject: [PATCH] Lifted ambiguity in function name
setRetrieveJobBatchReportedToUser.
Reports can now be either "to user" or "to repack".
---
scheduler/OStoreDB/OStoreDB.cpp | 2 +-
scheduler/OStoreDB/OStoreDB.hpp | 2 +-
scheduler/OStoreDB/OStoreDBFactory.hpp | 4 ++--
scheduler/Scheduler.cpp | 2 +-
scheduler/SchedulerDatabase.hpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 4524636ca5..bb2a1ca6ad 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -966,7 +966,7 @@ void OStoreDB::setArchiveJobBatchReported(std::list<cta::SchedulerDatabase::Arch
//------------------------------------------------------------------------------
// OStoreDB::setRetrieveJobBatchReported()
//------------------------------------------------------------------------------
-void OStoreDB::setRetrieveJobBatchReported(std::list<cta::SchedulerDatabase::RetrieveJob*> & jobsBatch,
+void OStoreDB::setRetrieveJobBatchReportedToUser(std::list<cta::SchedulerDatabase::RetrieveJob*> & jobsBatch,
log::TimingList & timingList, utils::Timer & t, log::LogContext & lc)
{
struct FailedJobToQueue {
diff --git a/scheduler/OStoreDB/OStoreDB.hpp b/scheduler/OStoreDB/OStoreDB.hpp
index 273bf1361d..895b1d0076 100644
--- a/scheduler/OStoreDB/OStoreDB.hpp
+++ b/scheduler/OStoreDB/OStoreDB.hpp
@@ -315,7 +315,7 @@ public:
std::list<std::unique_ptr<SchedulerDatabase::RetrieveJob>> getNextRetrieveJobsToReportBatch(uint64_t filesRequested, log::LogContext &logContext) override;
- void setRetrieveJobBatchReported(std::list<cta::SchedulerDatabase::RetrieveJob*> & jobsBatch,
+ void setRetrieveJobBatchReportedToUser(std::list<cta::SchedulerDatabase::RetrieveJob*> & jobsBatch,
log::TimingList & timingList, utils::Timer & t, log::LogContext & lc) override;
std::list<std::unique_ptr<SchedulerDatabase::RetrieveJob>> getNextRetrieveJobsFailedBatch(uint64_t filesRequested, log::LogContext &logContext) override;
diff --git a/scheduler/OStoreDB/OStoreDBFactory.hpp b/scheduler/OStoreDB/OStoreDBFactory.hpp
index 01fcc1b94b..cb1ef92be6 100644
--- a/scheduler/OStoreDB/OStoreDBFactory.hpp
+++ b/scheduler/OStoreDB/OStoreDBFactory.hpp
@@ -167,9 +167,9 @@ public:
m_OStoreDB.setArchiveJobBatchReported(jobsBatch, timingList, t, lc);
}
- void setRetrieveJobBatchReported(std::list<cta::SchedulerDatabase::RetrieveJob*>& jobsBatch, log::TimingList & timingList,
+ void setRetrieveJobBatchReportedToUser(std::list<cta::SchedulerDatabase::RetrieveJob*>& jobsBatch, log::TimingList & timingList,
utils::Timer & t, log::LogContext& lc) override {
- m_OStoreDB.setRetrieveJobBatchReported(jobsBatch, timingList, t, lc);
+ m_OStoreDB.setRetrieveJobBatchReportedToUser(jobsBatch, timingList, t, lc);
}
std::list<RetrieveRequestDump> getRetrieveRequestsByVid(const std::string& vid) const override {
diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index e41945a8b5..265cd6b56f 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -1458,7 +1458,7 @@ reportRetrieveJobsBatch(std::list<std::unique_ptr<RetrieveJob>> & retrieveJobsBa
timingList.insertAndReset("reportCompletionTime", t);
std::list<SchedulerDatabase::RetrieveJob *> reportedDbJobs;
for(auto &j: reportedJobs) reportedDbJobs.push_back(j->m_dbJob.get());
- m_db.setRetrieveJobBatchReported(reportedDbJobs, timingList, t, lc);
+ m_db.setRetrieveJobBatchReportedToUser(reportedDbJobs, timingList, t, lc);
// Log the successful reports.
for(auto & j: reportedJobs) {
log::ScopedParamContainer params(lc);
diff --git a/scheduler/SchedulerDatabase.hpp b/scheduler/SchedulerDatabase.hpp
index 97f4d95ec7..b68a60c800 100644
--- a/scheduler/SchedulerDatabase.hpp
+++ b/scheduler/SchedulerDatabase.hpp
@@ -474,7 +474,7 @@ public:
* @param jobsBatch
* @param lc
*/
- virtual void setRetrieveJobBatchReported(std::list<cta::SchedulerDatabase::RetrieveJob*> & jobsBatch, log::TimingList & timingList, utils::Timer & t, log::LogContext & lc) = 0;
+ virtual void setRetrieveJobBatchReportedToUser(std::list<cta::SchedulerDatabase::RetrieveJob*> & jobsBatch, log::TimingList & timingList, utils::Timer & t, log::LogContext & lc) = 0;
virtual JobsFailedSummary getRetrieveJobsFailedSummary(log::LogContext &logContext) = 0;
--
GitLab