From 7d3c41040bc7a6da629a3872321295ce91f00d29 Mon Sep 17 00:00:00 2001 From: guenther Date: Thu, 4 Dec 2025 11:46:04 +0100 Subject: [PATCH 1/6] add scheduler backend name to repack ls output --- cmdline/CtaAdminTextFormatter.cpp | 2 ++ frontend/common/RepackLsResponseStream.cpp | 5 ++++- frontend/common/RepackLsResponseStream.hpp | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmdline/CtaAdminTextFormatter.cpp b/cmdline/CtaAdminTextFormatter.cpp index 83e4719d2b..450e46389d 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 abb0fba3a5..5ef0279f8b 100644 --- a/frontend/common/RepackLsResponseStream.cpp +++ b/frontend/common/RepackLsResponseStream.cpp @@ -37,6 +37,9 @@ RepackLsResponseStream::RepackLsResponseStream(cta::catalogue::Catalogue& catalo bool has_any = false; auto vid = request.getOptional(OptionString::VID, &has_any); + // Get scheduler backend name + m_schedulerBackendName = m_scheduler.getSchedulerBackendName(); + collectRepacks(vid); } @@ -75,7 +78,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 81d29171e2..d0cd541435 100644 --- a/frontend/common/RepackLsResponseStream.hpp +++ b/frontend/common/RepackLsResponseStream.hpp @@ -37,6 +37,7 @@ public: private: std::list m_repackItems; void collectRepacks(const std::optional& vid); + std::optional m_schedulerBackendName; }; } // namespace cta::frontend \ No newline at end of file -- GitLab From 3170ff7133dd4f0601be0b812f04e83acada8309 Mon Sep 17 00:00:00 2001 From: guenther Date: Thu, 4 Dec 2025 11:53:56 +0100 Subject: [PATCH 2/6] updating to xrootd-ssi v1.28 --- xrootd-ssi-protobuf-interface | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface index 16003342b2..a2926efe3f 160000 --- a/xrootd-ssi-protobuf-interface +++ b/xrootd-ssi-protobuf-interface @@ -1 +1 @@ -Subproject commit 16003342b219fda5d6d0715264fce48ac35c9429 +Subproject commit a2926efe3f6c8c251446112eb86b56575a9080f7 -- GitLab From b4e51baaee18d3c607df1d2069579e3a49c85815 Mon Sep 17 00:00:00 2001 From: guenther Date: Fri, 5 Dec 2025 16:55:16 +0100 Subject: [PATCH 3/6] fix issue with scheduler backend name optional --- frontend/common/RepackLsResponseStream.cpp | 2 +- frontend/grpc/callback_api/ServerVersion.hpp | 2 +- xroot_plugins/XrdCtaVersion.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/common/RepackLsResponseStream.cpp b/frontend/common/RepackLsResponseStream.cpp index 5ef0279f8b..6599ddee20 100644 --- a/frontend/common/RepackLsResponseStream.cpp +++ b/frontend/common/RepackLsResponseStream.cpp @@ -78,7 +78,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_scheduler_backend_name(m_schedulerBackendName.value_or("")); repackRequestItem->set_instance_name(m_instanceName); repackRequestItem->set_vid(repackRequest.vid); repackRequestItem->set_tapepool(tapeVidMap[repackRequest.vid].tapePoolName); diff --git a/frontend/grpc/callback_api/ServerVersion.hpp b/frontend/grpc/callback_api/ServerVersion.hpp index 578193113e..85fdffb35a 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 4b7c616ae6..7978511ec1 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); -- GitLab From f82459657745d604b384cae855d44edcec5b9960 Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 8 Dec 2025 08:41:56 +0100 Subject: [PATCH 4/6] fix comments --- frontend/common/RepackLsResponseStream.cpp | 2 +- frontend/common/RepackLsResponseStream.hpp | 32 ++++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/frontend/common/RepackLsResponseStream.cpp b/frontend/common/RepackLsResponseStream.cpp index 6599ddee20..5ef0279f8b 100644 --- a/frontend/common/RepackLsResponseStream.cpp +++ b/frontend/common/RepackLsResponseStream.cpp @@ -78,7 +78,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.value_or("")); + 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 d0cd541435..c7b28a5cd9 100644 --- a/frontend/common/RepackLsResponseStream.hpp +++ b/frontend/common/RepackLsResponseStream.hpp @@ -24,20 +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); - std::optional m_schedulerBackendName; -}; + 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 -- GitLab From 532dce01670e8cd1fa1de382ee67b03e88c95d40 Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 8 Dec 2025 08:48:23 +0100 Subject: [PATCH 5/6] fix comments --- frontend/common/RepackLsResponseStream.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/frontend/common/RepackLsResponseStream.cpp b/frontend/common/RepackLsResponseStream.cpp index 5ef0279f8b..f7cdf8fc5d 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); @@ -37,9 +38,6 @@ RepackLsResponseStream::RepackLsResponseStream(cta::catalogue::Catalogue& catalo bool has_any = false; auto vid = request.getOptional(OptionString::VID, &has_any); - // Get scheduler backend name - m_schedulerBackendName = m_scheduler.getSchedulerBackendName(); - collectRepacks(vid); } -- GitLab From b2627d8d097a807b5f7f25e8a12a360a3300c31a Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 8 Dec 2025 09:02:56 +0100 Subject: [PATCH 6/6] fix comments --- frontend/common/RepackLsResponseStream.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/common/RepackLsResponseStream.hpp b/frontend/common/RepackLsResponseStream.hpp index c7b28a5cd9..a904fa494a 100644 --- a/frontend/common/RepackLsResponseStream.hpp +++ b/frontend/common/RepackLsResponseStream.hpp @@ -37,7 +37,7 @@ namespace cta::frontend { private: std::list m_repackItems; - std::string &m_schedulerBackendName; + std::string m_schedulerBackendName; void collectRepacks(const std::optional &vid); }; -- GitLab