Commit 98dba38e authored by Eric Cano's avatar Eric Cano
Browse files

Removed unused functions...

..and other minor comment fixes.
parent 55f35da6
......@@ -440,16 +440,6 @@ void BackendRados::lock(std::string name, uint64_t timeout_us, LockType lockType
#endif
}
void BackendRados::lockWithIoContext(std::string name, uint64_t timeout_us, LockType lockType, const std::string& clientId, librados::IoCtx & radosCtx) {
#if RADOS_LOCKING_STRATEGY == NOTIFY
lockNotify(name, timeout_us, lockType, clientId, radosCtx);
#elif RADOS_LOCKING_STRATEGY == BACKOFF
lockBackoff(name, timeout_us, lockType, clientId, radosCtx);
#else
#error Wrong value for "RADOS_LOCKING_STRATEGY"
#endif
}
void BackendRados::lockNotify(std::string name, uint64_t timeout_us, LockType lockType,
const std::string & clientId, librados::IoCtx & radosCtx) {
// In Rados, locking a non-existing object will create it. This is not our intended
......
......@@ -116,8 +116,6 @@ private:
static std::string createUniqueClientId();
/** This function will lock or die (actually throw, that is) */
void lock(std::string name, uint64_t timeout_us, LockType lockType, const std::string & clientId);
void lockWithIoContext(std::string name, uint64_t timeout_us, LockType lockType, const std::string& clientId,
librados::IoCtx & radosCtx);
inline void lockBackoff(std::string name, uint64_t timeout_us, LockType lockType,
const std::string & clientId, librados::IoCtx & radosCtx);
inline void lockNotify(std::string name, uint64_t timeout_us, LockType lockType,
......
......@@ -31,7 +31,7 @@
namespace cta { namespace objectstore {
//------------------------------------------------------------------------------
// Helpers::getLockedAndFetchedArchiveQueue()
// Helpers::getLockedAndFetchedQueue <ArchiveQueue> ()
//------------------------------------------------------------------------------
template <>
void Helpers::getLockedAndFetchedQueue<ArchiveQueue>(ArchiveQueue& archiveQueue,
......@@ -108,7 +108,6 @@ void Helpers::getLockedAndFetchedQueue<ArchiveQueue>(ArchiveQueue& archiveQueue,
rootRefetchTime += t.secs(utils::Timer::resetCounter);
try {
re.removeArchiveQueueAndCommit(tapePool, queueType, lc);
rootQueueDereferenceTime += t.secs(utils::Timer::resetCounter);
log::ScopedParamContainer params(lc);
params.add("tapepool", tapePool)
......@@ -149,7 +148,7 @@ void Helpers::getLockedAndFetchedQueue<ArchiveQueue>(ArchiveQueue& archiveQueue,
//------------------------------------------------------------------------------
// Helpers::getLockedAndFetchedRetrieveQueue()
// Helpers::getLockedAndFetchedQueue <RetrieveQueue> ()
//------------------------------------------------------------------------------
template <>
void Helpers::getLockedAndFetchedQueue<RetrieveQueue>(RetrieveQueue& retrieveQueue,
......@@ -226,7 +225,6 @@ void Helpers::getLockedAndFetchedQueue<RetrieveQueue>(RetrieveQueue& retrieveQue
rootRefetchTime += t.secs(utils::Timer::resetCounter);
try {
re.removeRetrieveQueueAndCommit(vid, queueType, lc);
rootQueueDereferenceTime += t.secs(utils::Timer::resetCounter);
log::ScopedParamContainer params(lc);
params.add("vid", vid)
......
/*
* The CERN Tape Archive (CTA) project
* Copyright (C) 2015 CERN
......
......@@ -82,12 +82,6 @@ public:
std::list<std::string> getFailures();
std::string statusToString(const serializers::RetrieveJobStatus & status);
serializers::RetrieveJobStatus getJobStatus(uint16_t copyNumber);
// Mark all jobs as pending mount (following their linking to a tape pool)
void setAllJobsLinkingToTapePool();
// Mark all the jobs as being deleted, in case of a cancellation
void setAllJobsFailed();
// Mark all the jobs as pending deletion from NS.
void setAllJobsPendingNSdeletion();
CTA_GENERATE_EXCEPTION_CLASS(NoSuchJob);
// An asynchronous job ownership updating class.
class AsyncOwnerUpdater {
......@@ -104,9 +98,6 @@ public:
};
// An owner updater factory. The owner MUST be previousOwner for the update to be executed.
AsyncOwnerUpdater * asyncUpdateOwner(uint16_t copyNumber, const std::string & owner, const std::string &previousOwner);
// Request management ========================================================
void setSuccessful();
void setFailed();
// ===========================================================================
void setSchedulerRequest(const cta::common::dataStructures::RetrieveRequest & retrieveRequest);
cta::common::dataStructures::RetrieveRequest getSchedulerRequest();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment