From ca540a5caeb28ee995d5564ba893be6d71dadbbe Mon Sep 17 00:00:00 2001
From: Daniele Kruse <dkruse@cern.ch>
Date: Mon, 9 Nov 2015 11:23:21 +0100
Subject: [PATCH] Added missing creation log to retrieve requests
---
objectstore/Tape.cpp | 3 ++-
xroot_plugins/XrdCtaFile.cpp | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/objectstore/Tape.cpp b/objectstore/Tape.cpp
index ca8ce93ca4..8c8943f80e 100644
--- a/objectstore/Tape.cpp
+++ b/objectstore/Tape.cpp
@@ -193,6 +193,7 @@ auto cta::objectstore::Tape::dumpAndFetchRetrieveRequests()
auto & retReq = ret.back();
retReq.archiveFile = rtfr.getArchiveFile();
retReq.remoteFile = rtfr.getRemoteFile();
+ retReq.creationLog = rtfr.getCreationLog();
// Find the copy number from the list of jobs
retReq.activeCopyNb = rj->copynb();
auto jl = rtfr.dumpJobs();
@@ -207,7 +208,7 @@ auto cta::objectstore::Tape::dumpAndFetchRetrieveRequests()
} catch (cta::exception::Exception &) {}
}
return ret;
- }
+}
auto cta::objectstore::Tape::dumpJobs() -> std::list<JobDump> {
checkPayloadReadable();
diff --git a/xroot_plugins/XrdCtaFile.cpp b/xroot_plugins/XrdCtaFile.cpp
index e791b9557c..c541dc9df0 100644
--- a/xroot_plugins/XrdCtaFile.cpp
+++ b/xroot_plugins/XrdCtaFile.cpp
@@ -1133,7 +1133,7 @@ void XrdProFile::xCom_listpendingretrieves(const std::vector<std::string> &token
<< " " << std::setw(8) << "vid"
<< " " << std::setw(30) << "cta filepath"
<< " " << std::setw(16) << "size"
- << " " << std::setw(30) << "remote filepath"
+ << " " << std::setw(50) << "remote filepath"
<< " " << std::setw(8) << "copynb"
<< " " << std::setw(8) << "block id"
<< " " << std::setw(8) << "fseq"
@@ -1173,7 +1173,7 @@ void XrdProFile::xCom_listpendingretrieves(const std::vector<std::string> &token
responseSS << " " << std::setw(8) << vid->first.vid
<< " " << std::setw(30) << request->archiveFile.path
<< " " << std::setw(16) << request->archiveFile.size
- << " " << std::setw(30) << request->remoteFile
+ << " " << std::setw(50) << request->remoteFile
<< " " << std::setw(8) << request->activeCopyNb
<< " " << std::setw(8) << blockIdSS.str()
<< " " << std::setw(8) << fseqSS.str()
@@ -1214,7 +1214,7 @@ void XrdProFile::xCom_listpendingretrieves(const std::vector<std::string> &token
responseSS << " " << std::setw(8) << tapeVid
<< " " << std::setw(30) << request->archiveFile.path
<< " " << std::setw(16) << request->archiveFile.size
- << " " << std::setw(30) << request->remoteFile
+ << " " << std::setw(50) << request->remoteFile
<< " " << std::setw(8) << request->activeCopyNb
<< " " << std::setw(8) << blockIdSS.str()
<< " " << std::setw(8) << fseqSS.str()
--
GitLab