From 6ab0cf392fc5c2c0a7c6a0fca394e6c3b58645c5 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Wed, 30 Jan 2019 14:47:04 +0100
Subject: [PATCH] Fixes some variable names and typos
---
scheduler/OStoreDB/OStoreDB.cpp | 6 +++---
scheduler/OStoreDB/OStoreDB.hpp | 2 +-
scheduler/RetrieveMount.cpp | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 005c937826..c5284c30b4 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -2097,7 +2097,7 @@ OStoreDB::RetrieveJob * OStoreDB::castFromSchedDBJob(SchedulerDatabase::Retrieve
if (!ret) {
std::string unexpectedType = typeid(*job).name();
throw cta::exception::Exception(
- "In OStoreDB::RetrieveMount::castFromSchedDBJob(): unexpected archive job type while casting: " + unexpectedType
+ "In OStoreDB::RetrieveMount::castFromSchedDBJob(): unexpected retrieve job type while casting: " + unexpectedType
);
}
return ret;
@@ -2425,7 +2425,7 @@ void OStoreDB::ArchiveJob::failReport(const std::string& failureReason, log::Log
"In ArchiveJob::failReport(): stored job in failed container for operator handling.");
else
lc.log(log::ERR,
- "In ArchiveJob::failReport(): stored job in failed contained after unexpected next step.");
+ "In ArchiveJob::failReport(): stored job in failed container after unexpected next step.");
return;
}
}
@@ -2775,7 +2775,7 @@ void OStoreDB::RetrieveJob::failReport(const std::string &failureReason, log::Lo
"In RetrieveJob::failReport(): stored job in failed container for operator handling.");
else
lc.log(log::ERR,
- "In RetrieveJob::failReport(): stored job in failed contained after unexpected next step.");
+ "In RetrieveJob::failReport(): stored job in failed container after unexpected next step.");
return;
}
}
diff --git a/scheduler/OStoreDB/OStoreDB.hpp b/scheduler/OStoreDB/OStoreDB.hpp
index 0e48c8fe6c..7f26072dc1 100644
--- a/scheduler/OStoreDB/OStoreDB.hpp
+++ b/scheduler/OStoreDB/OStoreDB.hpp
@@ -186,7 +186,7 @@ public:
std::unique_ptr<objectstore::ArchiveRequest::AsyncTransferSuccessfulUpdater> m_succesfulTransferUpdater;
std::unique_ptr<objectstore::ArchiveRequest::AsyncRequestDeleter> m_requestDeleter;
};
- friend class ArchiveJob;
+ //friend class ArchiveJob;
static ArchiveJob * castFromSchedDBJob(SchedulerDatabase::ArchiveJob * job);
/* === Retrieve Mount handling ============================================ */
diff --git a/scheduler/RetrieveMount.cpp b/scheduler/RetrieveMount.cpp
index efbae6fe14..294b8bdbd2 100644
--- a/scheduler/RetrieveMount.cpp
+++ b/scheduler/RetrieveMount.cpp
@@ -91,8 +91,8 @@ std::list<std::unique_ptr<cta::RetrieveJob> > cta::RetrieveMount::getNextJobBatc
// waitAndFinishSettingJobsBatchRetrieved()
//------------------------------------------------------------------------------
void cta::RetrieveMount::waitAndFinishSettingJobsBatchRetrieved(std::queue<std::unique_ptr<cta::RetrieveJob> >& successfulRetrieveJobs, cta::log::LogContext& logContext) {
- std::list<std::unique_ptr<cta::RetrieveJob> > validatedSuccessfulArchiveJobs;
- std::list<cta::SchedulerDatabase::RetrieveJob *> validatedSuccessfulDBArchiveJobs;
+ std::list<std::unique_ptr<cta::RetrieveJob> > validatedSuccessfulRetrieveJobs;
+ std::list<cta::SchedulerDatabase::RetrieveJob *> validatedSuccessfulDBRetrieveJobs;
std::unique_ptr<cta::RetrieveJob> job;
double waitUpdateCompletionTime=0;
double jobBatchFinishingTime=0;
@@ -108,13 +108,13 @@ void cta::RetrieveMount::waitAndFinishSettingJobsBatchRetrieved(std::queue<std::
files++;
bytes+=job->archiveFile.fileSize;
job->checkComplete();
- validatedSuccessfulDBArchiveJobs.emplace_back(job->m_dbJob.get());
- validatedSuccessfulArchiveJobs.emplace_back(std::move(job));
+ validatedSuccessfulDBRetrieveJobs.emplace_back(job->m_dbJob.get());
+ validatedSuccessfulRetrieveJobs.emplace_back(std::move(job));
job.reset();
}
waitUpdateCompletionTime=t.secs(utils::Timer::resetCounter);
// Complete the cleaning up of the jobs in the mount
- m_dbMount->finishSettingJobsBatchSuccessful(validatedSuccessfulDBArchiveJobs, logContext);
+ m_dbMount->finishSettingJobsBatchSuccessful(validatedSuccessfulDBRetrieveJobs, logContext);
jobBatchFinishingTime=t.secs();
schedulerDbTime=jobBatchFinishingTime + waitUpdateCompletionTime;
{
--
GitLab