From df7d555514eae2d41d6c8553cbaf113d9b91f013 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Mon, 26 Nov 2018 15:43:06 +0100
Subject: [PATCH] [os-generic-queues] Renames getNextFailedRetrieveJobsBatch
for consistency
Scheduler and DB versions are now both called getNextRetrieveJobsFailedBatch()
---
scheduler/Scheduler.cpp | 4 ++--
scheduler/Scheduler.hpp | 4 ++--
scheduler/SchedulerTest.cpp | 8 ++++----
xroot_plugins/XrdSsiCtaRequestMessage.cpp | 1 +
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index a25aa93120..768aaac4c4 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -1098,10 +1098,10 @@ getNextRetrieveJobsToReportBatch(uint64_t filesRequested, log::LogContext &logCo
}
//------------------------------------------------------------------------------
-// getNextFailedRetrieveJobsBatch
+// getNextRetrieveJobsFailedBatch
//------------------------------------------------------------------------------
std::list<std::unique_ptr<RetrieveJob>> Scheduler::
-getNextFailedRetrieveJobsBatch(uint64_t filesRequested, log::LogContext &logContext)
+getNextRetrieveJobsFailedBatch(uint64_t filesRequested, log::LogContext &logContext)
{
// We need to go through the queues of failed retrieve jobs
std::list<std::unique_ptr<RetrieveJob>> ret;
diff --git a/scheduler/Scheduler.hpp b/scheduler/Scheduler.hpp
index dbbaa5ff5a..7f00f61e1c 100644
--- a/scheduler/Scheduler.hpp
+++ b/scheduler/Scheduler.hpp
@@ -362,8 +362,8 @@ public:
* @returns A list of unique_ptr to the next batch of failed retrieve jobs. The list
* is empty when no more jobs can be found.
*/
- std::list<std::unique_ptr<RetrieveJob>> getNextFailedRetrieveJobsBatch(uint64_t filesRequested,
- log::LogContext &logContext);
+ std::list<std::unique_ptr<RetrieveJob>>
+ getNextRetrieveJobsFailedBatch(uint64_t filesRequested, log::LogContext &logContext);
public:
/*============== Administrator management ==================================*/
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index e5b6670669..f4d0289d89 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -795,7 +795,7 @@ TEST_P(SchedulerTest, archive_and_retrieve_failure) {
auto rqsts = scheduler.getPendingRetrieveJobs(lc);
ASSERT_EQ(0, rqsts.size());
// The failed queue should be empty
- auto retrieveJobFailedList = scheduler.getNextFailedRetrieveJobsBatch(10,lc);
+ auto retrieveJobFailedList = scheduler.getNextRetrieveJobsFailedBatch(10,lc);
ASSERT_EQ(0, retrieveJobFailedList.size());
// Emulate the the reporter process
auto jobsToReport = scheduler.getNextRetrieveJobsToReportBatch(10, lc);
@@ -809,7 +809,7 @@ TEST_P(SchedulerTest, archive_and_retrieve_failure) {
{
// There should be one failed job
- auto retrieveJobFailedList = scheduler.getNextFailedRetrieveJobsBatch(10,lc);
+ auto retrieveJobFailedList = scheduler.getNextRetrieveJobsFailedBatch(10,lc);
ASSERT_EQ(1, retrieveJobFailedList.size());
}
}
@@ -1048,7 +1048,7 @@ TEST_P(SchedulerTest, archive_and_retrieve_report_failure) {
auto rqsts = scheduler.getPendingRetrieveJobs(lc);
ASSERT_EQ(0, rqsts.size());
// The failed queue should be empty
- auto retrieveJobFailedList = scheduler.getNextFailedRetrieveJobsBatch(10,lc);
+ auto retrieveJobFailedList = scheduler.getNextRetrieveJobsFailedBatch(10,lc);
ASSERT_EQ(0, retrieveJobFailedList.size());
// The failure should be on the jobs to report queue
auto retrieveJobToReportList = scheduler.getNextRetrieveJobsToReportBatch(10,lc);
@@ -1067,7 +1067,7 @@ TEST_P(SchedulerTest, archive_and_retrieve_report_failure) {
{
// There should be one failed job
- auto retrieveJobFailedList = scheduler.getNextFailedRetrieveJobsBatch(10,lc);
+ auto retrieveJobFailedList = scheduler.getNextRetrieveJobsFailedBatch(10,lc);
ASSERT_EQ(1, retrieveJobFailedList.size());
}
}
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
index 895b8cb27c..52b65eed72 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -1035,6 +1035,7 @@ void RequestMessage::processDrive_Rm(const cta::admin::AdminCmd &admincmd, cta::
void RequestMessage::processFailedRequest_Ls(const cta::admin::AdminCmd &admincmd, cta::xrd::Response &response)
{
//m_scheduler.listQueueItems(m_cliIdentity.username, "failed queue", m_lc);
+ //auto retrieveJobFailedList = scheduler.getNextRetrieveJobsFailedBatch(10,lc);
}
--
GitLab