diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp index d2532f114ed9a79de1e2ebcbddd2cdac67cc60d1..0172f1aea4f184e540ca849ebbdecd750e25f196 100644 --- a/scheduler/Scheduler.cpp +++ b/scheduler/Scheduler.cpp @@ -174,7 +174,7 @@ void cta::Scheduler::queueLabel(const cta::common::dataStructures::SecurityIdent //------------------------------------------------------------------------------ // repack //------------------------------------------------------------------------------ -void cta::Scheduler::repack(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const cta::common::dataStructures::RepackType) { +void cta::Scheduler::queueRepack(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const cta::common::dataStructures::RepackType) { throw cta::exception::Exception(std::string("Not implemented: ") + __PRETTY_FUNCTION__); } @@ -209,7 +209,7 @@ void cta::Scheduler::shrink(const cta::common::dataStructures::SecurityIdentity //------------------------------------------------------------------------------ // verify //------------------------------------------------------------------------------ -void cta::Scheduler::verify(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const optional<uint64_t> numberOfFiles) { +void cta::Scheduler::queueVerify(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const optional<uint64_t> numberOfFiles) { throw cta::exception::Exception(std::string("Not implemented: ") + __PRETTY_FUNCTION__); } diff --git a/scheduler/Scheduler.hpp b/scheduler/Scheduler.hpp index 6d3959f3765669f1b18df83653dca95fab5a648a..0957e1398aed19415338f7bc4b9fab8066f50271 100644 --- a/scheduler/Scheduler.hpp +++ b/scheduler/Scheduler.hpp @@ -127,14 +127,14 @@ public: */ virtual void queueLabel(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool force, const bool lbp, const optional<std::string> &tag); - virtual void repack(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const cta::common::dataStructures::RepackType); + virtual void queueRepack(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const cta::common::dataStructures::RepackType); virtual void cancelRepack(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid); virtual std::list<cta::common::dataStructures::RepackInfo> getRepacks(const cta::common::dataStructures::SecurityIdentity &cliIdentity); virtual cta::common::dataStructures::RepackInfo getRepack(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid); virtual void shrink(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &tapepool); // removes extra tape copies from a specific pool(usually an "_2" pool) - virtual void verify(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const optional<uint64_t> numberOfFiles); //if numberOfFiles is nullopt, all files are verified + virtual void queueVerify(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const optional<std::string> &tag, const optional<uint64_t> numberOfFiles); //if numberOfFiles is nullopt, all files are verified virtual void cancelVerify(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid); virtual std::list<cta::common::dataStructures::VerifyInfo> getVerifys(const cta::common::dataStructures::SecurityIdentity &cliIdentity) const; virtual cta::common::dataStructures::VerifyInfo getVerify(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) const; diff --git a/xroot_plugins/XrdCtaFile.cpp b/xroot_plugins/XrdCtaFile.cpp index e93f895737f6225055a3741b6008943a04efe81e..40e5e7924ce00c3e879259be01adc2537333c8dc 100644 --- a/xroot_plugins/XrdCtaFile.cpp +++ b/xroot_plugins/XrdCtaFile.cpp @@ -1511,7 +1511,7 @@ void XrdCtaFile::xCom_repack() { throw cta::exception::UserError(help.str()); } checkOptions(help.str()); - m_scheduler->repack(m_cliIdentity, vid.value(), tag, type); + m_scheduler->queueRepack(m_cliIdentity, vid.value(), tag, type); } else if("err" == m_requestTokens.at(2)) { //err cta::common::dataStructures::RepackInfo info = m_scheduler->getRepack(m_cliIdentity, vid.value()); @@ -1617,7 +1617,7 @@ void XrdCtaFile::xCom_verify() { optional<std::string> tag = getOptionStringValue("-t", "--tag", false, false); optional<uint64_t> numberOfFiles = getOptionUint64Value("-p", "--partial", false, false); //nullopt means do a complete verification checkOptions(help.str()); - m_scheduler->verify(m_cliIdentity, vid.value(), tag, numberOfFiles); + m_scheduler->queueVerify(m_cliIdentity, vid.value(), tag, numberOfFiles); } else if("err" == m_requestTokens.at(2)) { //err checkOptions(help.str());