diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp index 4524636ca5cefcab2fd038dbfb493437e4dc115a..bb2a1ca6adf2101bc9f7fa1d4399b175bb1c969d 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 273bf1361d84a330c9b927aecdb06c075ac876ab..895b1d007675088cd3e120491c43f9b406942958 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 01fcc1b94b8cc8c96d12800cfd24d68a2e0af2b6..cb1ef92be62e03516579f152b4d701e09138ce96 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 e41945a8b5a6af5873187a1c6e67bf753abba85d..265cd6b56f2ce9bcc9db7cbd2b3df817d5d6f8ed 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 97f4d95ec7015cbed66fd0d9f21690d299a3c2a7..b68a60c8000993221b94a217281e6fd2857e1d80 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;