From 13e401d6cd36c81c08837499467491bfd4bcbb9b Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Wed, 11 Mar 2020 12:06:39 +0100
Subject: [PATCH] [frontend] Adds extra fields into failed archive request
protobuf
---
xroot_plugins/XrdCtaFailedRequestLs.hpp | 6 ++++++
xrootd-ssi-protobuf-interface | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/xroot_plugins/XrdCtaFailedRequestLs.hpp b/xroot_plugins/XrdCtaFailedRequestLs.hpp
index 20d0228ee4..c6bfda56d0 100644
--- a/xroot_plugins/XrdCtaFailedRequestLs.hpp
+++ b/xroot_plugins/XrdCtaFailedRequestLs.hpp
@@ -136,12 +136,17 @@ pushRecord(XrdSsiPb::OStreamBuffer<Data> *streambuf, const common::dataStructure
{
Data record;
+ record.mutable_frls_item()->set_object_id("PLACEHOLDER");
record.mutable_frls_item()->set_request_type(admin::RequestType::ARCHIVE_REQUEST);
record.mutable_frls_item()->set_tapepool(m_archiveQueueItorPtr->qid());
record.mutable_frls_item()->set_copy_nb(item.copyNumber);
record.mutable_frls_item()->mutable_requester()->set_username(item.request.requester.name);
record.mutable_frls_item()->mutable_requester()->set_groupname(item.request.requester.group);
+ record.mutable_frls_item()->mutable_af()->set_disk_id(item.request.diskFileID);
+ record.mutable_frls_item()->mutable_af()->set_size(item.request.fileSize);
+ record.mutable_frls_item()->mutable_af()->set_storage_class(item.request.storageClass);
record.mutable_frls_item()->mutable_af()->mutable_df()->set_path(item.request.diskFileInfo.path);
+ record.mutable_frls_item()->mutable_af()->set_creation_time(item.request.creationLog.time);
if(m_isLogEntries) {
*record.mutable_frls_item()->mutable_failurelogs() = { item.failurelogs.begin(), item.failurelogs.end() };
@@ -160,6 +165,7 @@ pushRecord(XrdSsiPb::OStreamBuffer<Data> *streambuf, const common::dataStructure
Data record;
+ record.mutable_frls_item()->set_object_id("PLACEHOLDER");
record.mutable_frls_item()->set_request_type(admin::RequestType::RETRIEVE_REQUEST);
record.mutable_frls_item()->mutable_tf()->set_vid(vid);
record.mutable_frls_item()->set_copy_nb(item.tapeCopies.at(vid).first);
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index aba1496820..57e4db551b 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit aba14968206d3627d2332bb8ec71d3ef5aa00953
+Subproject commit 57e4db551bbc617fc52a0b592f0d802f663f2b77
--
GitLab