diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp index fe329ff925e0b8f4aa0ec46536042732ab665a0e..2fbe2f40493ad92aa9c7e962605ac11bcadf0e7a 100644 --- a/scheduler/OStoreDB/OStoreDB.cpp +++ b/scheduler/OStoreDB/OStoreDB.cpp @@ -3850,32 +3850,4 @@ void OStoreDB::RetrieveJob::asyncSetSuccessful() { } } -//------------------------------------------------------------------------------ -// OStoreDB::getNextSucceededRetrieveRequestForRepackBatch() -//------------------------------------------------------------------------------ -std::list<std::unique_ptr<cta::objectstore::RetrieveRequest>> OStoreDB::getNextRetrieveRequestToReportToRepackForSuccessBatch(uint64_t filesRequested, log::LogContext& lc) -{ - std::list<std::unique_ptr<cta::objectstore::RetrieveRequest>> ret; - typedef objectstore::ContainerAlgorithms<RetrieveQueue,RetrieveQueueToReportToRepackForSuccess> Carqtrtrfs; - Carqtrtrfs algo(this->m_objectStore, *m_agentReference); - // Decide from which queue we are going to pop. - RootEntry re(m_objectStore); - re.fetchNoLock(); - while(true) { - auto queueList = re.dumpRetrieveQueues(JobQueueType::JobsToReportToRepackForSuccess); - if (queueList.empty()) return ret; - - // Try to get jobs from the first queue. If it is empty, it will be trimmed, so we can go for another round. - Carqtrtrfs::PopCriteria criteria; - criteria.files = filesRequested; - auto jobs = algo.popNextBatch(queueList.front().vid, criteria, lc); - if(jobs.elements.empty()) continue; - for(auto &j : jobs.elements) - { - ret.emplace_back(std::move(j.retrieveRequest)); - } - return ret; - } -} - } // namespace cta diff --git a/scheduler/OStoreDB/OStoreDB.hpp b/scheduler/OStoreDB/OStoreDB.hpp index 7dff16c9e8a26cbca6baa0e573048f2bde98705e..0995f290c2dba7ca71b0c180ce594977140b9ad7 100644 --- a/scheduler/OStoreDB/OStoreDB.hpp +++ b/scheduler/OStoreDB/OStoreDB.hpp @@ -319,14 +319,6 @@ public: 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; - - /** - * Return the list of all RetrieveRequests that are in the RetrieveQueueToReportToRepackForSuccess - * @param filesRequested : The number of files we would like to return - * @param lc - * @return The list of all RetrieveRequests that are queued in the RetrieveQueueToReportToRepackForSuccess - */ - std::list<std::unique_ptr<cta::objectstore::RetrieveRequest>> getNextRetrieveRequestToReportToRepackForSuccessBatch(uint64_t filesRequested, log::LogContext& lc) override; JobsFailedSummary getRetrieveJobsFailedSummary(log::LogContext &logContext) override; diff --git a/scheduler/OStoreDB/OStoreDBFactory.hpp b/scheduler/OStoreDB/OStoreDBFactory.hpp index a7e184f0b0aa150288a27ae238b62b5deeb56694..1e9694ebdcdea1616838228219186b3a00de90c4 100644 --- a/scheduler/OStoreDB/OStoreDBFactory.hpp +++ b/scheduler/OStoreDB/OStoreDBFactory.hpp @@ -154,10 +154,6 @@ public: return m_OStoreDB.getNextRetrieveJobsFailedBatch(filesRequested, lc); } - std::list<std::unique_ptr<cta::objectstore::RetrieveRequest>> getNextRetrieveRequestToReportToRepackForSuccessBatch(uint64_t filesRequested, log::LogContext& lc) override { - return m_OStoreDB.getNextRetrieveRequestToReportToRepackForSuccessBatch(filesRequested,lc); - } - std::unique_ptr<RepackReportBatch> getNextRepackReportBatch(log::LogContext& lc) override { return m_OStoreDB.getNextRepackReportBatch(lc); } diff --git a/scheduler/SchedulerDatabase.hpp b/scheduler/SchedulerDatabase.hpp index e7f2b3fd477a72c5968ae6498dfeae77ec8aa31d..d0a2ccc5cc6091ff86c2cd707bbe167f5d570ee3 100644 --- a/scheduler/SchedulerDatabase.hpp +++ b/scheduler/SchedulerDatabase.hpp @@ -461,14 +461,6 @@ public: */ virtual std::list<std::unique_ptr<RetrieveJob>> getNextRetrieveJobsToReportBatch(uint64_t filesRequested, log::LogContext &logContext) = 0; virtual std::list<std::unique_ptr<RetrieveJob>> getNextRetrieveJobsFailedBatch(uint64_t filesRequested, log::LogContext &logContext) = 0; - /** - * Return the list of all RetrieveRequests that are in the RetrieveQueueToReportToRepackForSuccess - * @param filesRequested : The number of files we would like to return - * @param lc - * @return The list of all RetrieveRequests that are queued in the RetrieveQueueToReportToRepackForSuccess - */ - virtual std::list<std::unique_ptr<cta::objectstore::RetrieveRequest>> getNextRetrieveRequestToReportToRepackForSuccessBatch(uint64_t filesRequested, log::LogContext& logContext) = 0; - /** * A base class handling the various types of reports to repack. Implementation if left to Db implementer.