From d145919f18b1c80dd72b82f92fde0248cf7d5ac8 Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Tue, 12 Mar 2019 11:50:27 +0100
Subject: [PATCH] #450: Removed function which is now included in
SchedulerDatabase::getNextRepackReportBatch().
---
scheduler/OStoreDB/OStoreDB.cpp | 28 --------------------------
scheduler/OStoreDB/OStoreDB.hpp | 8 --------
scheduler/OStoreDB/OStoreDBFactory.hpp | 4 ----
scheduler/SchedulerDatabase.hpp | 8 --------
4 files changed, 48 deletions(-)
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index fe329ff925..2fbe2f4049 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 7dff16c9e8..0995f290c2 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 a7e184f0b0..1e9694ebdc 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 e7f2b3fd47..d0a2ccc5cc 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.
--
GitLab