diff --git a/cmdline/CtaAdminTextFormatter.cpp b/cmdline/CtaAdminTextFormatter.cpp index 83e4719d2b609a925cfda43e0c6a37610c10252f..450e46389db1c12eaf0b497c7ce2994e7b085fca 100644 --- a/cmdline/CtaAdminTextFormatter.cpp +++ b/cmdline/CtaAdminTextFormatter.cpp @@ -628,6 +628,7 @@ void TextFormatter::printRepackLsHeader() { "filesToArchive", "failed", "status", + "scheduler", "instance"); } @@ -650,6 +651,7 @@ void TextFormatter::print(const RepackLsItem& rels_item) { rels_item.files_left_to_archive(), //https://gitlab.cern.ch/cta/CTA/-/issues/680#note_3845829 rels_item.total_failed_files(), //https://gitlab.cern.ch/cta/CTA/-/issues/680#note_3849927 rels_item.status(), + rels_item.scheduler_backend_name(), rels_item.instance_name()); } diff --git a/frontend/common/RepackLsResponseStream.cpp b/frontend/common/RepackLsResponseStream.cpp index abb0fba3a5c0cb43262a1a99d2c8aa2c2faf5e40..f7cdf8fc5dc1c958864621dfd86612338b0b1148 100644 --- a/frontend/common/RepackLsResponseStream.cpp +++ b/frontend/common/RepackLsResponseStream.cpp @@ -24,12 +24,13 @@ namespace cta::frontend { -RepackLsResponseStream::RepackLsResponseStream(cta::catalogue::Catalogue& catalogue, - cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd) - : CtaAdminResponseStream(catalogue, scheduler, instanceName) { - using namespace cta::admin; + RepackLsResponseStream::RepackLsResponseStream(cta::catalogue::Catalogue &catalogue, + cta::Scheduler &scheduler, + const std::string &instanceName, + const admin::AdminCmd &adminCmd) + : CtaAdminResponseStream(catalogue, scheduler, instanceName), + m_schedulerBackendName(m_scheduler.getSchedulerBackendName()) { + using namespace cta::admin; cta::frontend::AdminCmdOptions request(adminCmd); @@ -75,7 +76,7 @@ void RepackLsResponseStream::collectRepacks(const std::optional& vi uint64_t filesLeftToArchive = repackRequest.totalFilesToArchive - repackRequest.archivedFiles; uint64_t totalFilesToRetrieve = repackRequest.totalFilesToRetrieve; uint64_t totalFilesToArchive = repackRequest.totalFilesToArchive; - + repackRequestItem->set_scheduler_backend_name(m_schedulerBackendName); repackRequestItem->set_instance_name(m_instanceName); repackRequestItem->set_vid(repackRequest.vid); repackRequestItem->set_tapepool(tapeVidMap[repackRequest.vid].tapePoolName); diff --git a/frontend/common/RepackLsResponseStream.hpp b/frontend/common/RepackLsResponseStream.hpp index 81d29171e27d1b81b3aa3212b13d4aaea91ed86c..a904fa494af343e15bb505cb1fe68724dc318b3c 100644 --- a/frontend/common/RepackLsResponseStream.hpp +++ b/frontend/common/RepackLsResponseStream.hpp @@ -24,19 +24,22 @@ namespace cta::frontend { -class RepackLsResponseStream final : public CtaAdminResponseStream { -public: - RepackLsResponseStream(cta::catalogue::Catalogue& catalogue, - cta::Scheduler& scheduler, - const std::string& instanceName, - const admin::AdminCmd& adminCmd); - - bool isDone() override; - cta::xrd::Data next() override; - -private: - std::list m_repackItems; - void collectRepacks(const std::optional& vid); -}; + class RepackLsResponseStream final : public CtaAdminResponseStream { + public: + RepackLsResponseStream(cta::catalogue::Catalogue &catalogue, + cta::Scheduler &scheduler, + const std::string &instanceName, + const admin::AdminCmd &adminCmd); + + bool isDone() override; + + cta::xrd::Data next() override; + + private: + std::list m_repackItems; + std::string m_schedulerBackendName; + + void collectRepacks(const std::optional &vid); + }; } // namespace cta::frontend \ No newline at end of file diff --git a/frontend/grpc/callback_api/ServerVersion.hpp b/frontend/grpc/callback_api/ServerVersion.hpp index 578193113e89509fa5c4816320e1c9c0b42b30d6..85fdffb35add716d46d2dc3c9dea66b8b13d583b 100644 --- a/frontend/grpc/callback_api/ServerVersion.hpp +++ b/frontend/grpc/callback_api/ServerVersion.hpp @@ -75,7 +75,7 @@ void VersionWriteReactor::NextWrite() { version->set_catalogue_connection_string(m_catalogue_conn_string); version->set_catalogue_version(m_catalogue_version); version->set_is_upgrading(m_is_upgrading); - version->set_scheduler_backend_name(m_schedulerBackendName.value()); + version->set_scheduler_backend_name(m_schedulerBackendName.value_or("")); version->set_instance_name(m_instanceName); m_isVersionSent = true; diff --git a/xroot_plugins/XrdCtaVersion.hpp b/xroot_plugins/XrdCtaVersion.hpp index 4b7c616ae6f2446df20d3ccbd6c947b4f4c7097f..7978511ec1857cfe39535c9782d94b5718f6764f 100644 --- a/xroot_plugins/XrdCtaVersion.hpp +++ b/xroot_plugins/XrdCtaVersion.hpp @@ -101,7 +101,7 @@ inline int VersionStream::fillBuffer(XrdSsiPb::OStreamBuffer* streambuf) { version->set_catalogue_connection_string(m_catalogue_conn_string); version->set_catalogue_version(m_catalogue_version); version->set_is_upgrading(m_is_upgrading); - version->set_scheduler_backend_name(m_schedulerBackendName.value()); + version->set_scheduler_backend_name(m_schedulerBackendName.value_or("")); version->set_instance_name(m_instanceName); streambuf->Push(record); diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface index 16003342b219fda5d6d0715264fce48ac35c9429..a2926efe3f6c8c251446112eb86b56575a9080f7 160000 --- a/xrootd-ssi-protobuf-interface +++ b/xrootd-ssi-protobuf-interface @@ -1 +1 @@ -Subproject commit 16003342b219fda5d6d0715264fce48ac35c9429 +Subproject commit a2926efe3f6c8c251446112eb86b56575a9080f7