From 06d016699e4c1ab0e4b3ba5bc7ba1e13cbeb5aef Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Fri, 8 Feb 2019 15:14:06 +0100
Subject: [PATCH] [os-failedrequests] Displays failed retrieve queues correctly
---
xroot_plugins/XrdSsiCtaRequestMessage.cpp | 4 ++--
xroot_plugins/XrdSsiCtaServiceProvider.cpp | 1 -
xroot_plugins/XrdSsiCtaServiceProvider.hpp | 1 -
xrootd-ssi-protobuf-interface | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
index c7adbed8d4..dfa4139ec9 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -1049,9 +1049,9 @@ void RequestMessage::processFailedRequest_Ls(const cta::admin::AdminCmd &admincm
std::string vid = "";
OStoreDB::ArchiveQueueItor_t *archiveQueueItorPtr =
- has_flag(OptionBoolean::JUSTRETRIEVE) ? nullptr : m_scheddb.getArchiveJobItorPtr(tapepool);
+ has_flag(OptionBoolean::JUSTRETRIEVE) ? nullptr : m_scheddb.getArchiveJobItorPtr(tapepool, objectstore::QueueType::FailedJobs);
OStoreDB::RetrieveQueueItor_t *retrieveQueueItorPtr =
- has_flag(OptionBoolean::JUSTARCHIVE) ? nullptr : m_scheddb.getRetrieveJobItorPtr(vid);
+ has_flag(OptionBoolean::JUSTARCHIVE) ? nullptr : m_scheddb.getRetrieveJobItorPtr(vid, objectstore::QueueType::FailedJobs);
// Create a XrdSsi stream object to return the results
stream = new FailedRequestLsStream(m_scheduler, archiveQueueItorPtr, retrieveQueueItorPtr, has_flag(OptionBoolean::SUMMARY), has_flag(OptionBoolean::SHOW_LOG_ENTRIES), m_lc);
diff --git a/xroot_plugins/XrdSsiCtaServiceProvider.cpp b/xroot_plugins/XrdSsiCtaServiceProvider.cpp
index 3756ddc2e6..255e80cfd9 100644
--- a/xroot_plugins/XrdSsiCtaServiceProvider.cpp
+++ b/xroot_plugins/XrdSsiCtaServiceProvider.cpp
@@ -174,4 +174,3 @@ XrdSsiProvider::rStat XrdSsiCtaServiceProvider::QueryResource(const char *rName,
return resourcePresence;
}
-
diff --git a/xroot_plugins/XrdSsiCtaServiceProvider.hpp b/xroot_plugins/XrdSsiCtaServiceProvider.hpp
index 660821f0f7..34ba96f57d 100644
--- a/xroot_plugins/XrdSsiCtaServiceProvider.hpp
+++ b/xroot_plugins/XrdSsiCtaServiceProvider.hpp
@@ -142,4 +142,3 @@ private:
static constexpr const char* const LOG_SUFFIX = "XrdSsiCtaServiceProvider"; //!< Identifier for log messages
};
-
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index 3c85295b46..7d3e73e929 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit 3c85295b463f14a5b6959b826d01696b42892f27
+Subproject commit 7d3e73e9299652bc2fc74275faf2ca5ca0e0d08d
--
GitLab