[lpa_stream] Adds fileSize member to common::dataStructures::RetrieveJob

common/dataStructures/RetrieveJob.cpp

@@ -34,6 +34,7 @@ RetrieveJob::RetrieveJob() {}
 //------------------------------------------------------------------------------
 bool RetrieveJob::operator==(const RetrieveJob &rhs) const {
   return request==rhs.request
+      && fileSize==rhs.fileSize
       && tapeCopies==rhs.tapeCopies;
 }
 
@@ -49,6 +50,7 @@ bool RetrieveJob::operator!=(const RetrieveJob &rhs) const {
 //------------------------------------------------------------------------------
 std::ostream &operator<<(std::ostream &os, const RetrieveJob &obj) {
   os << "(request=" << obj.request
+     << " fileSize=" << obj.fileSize
      << " tapeFiles=" << obj.tapeCopies << ")";
   return os;
 }

common/dataStructures/RetrieveJob.hpp

@@ -43,6 +43,7 @@ struct RetrieveJob {
   bool operator!=(const RetrieveJob &rhs) const;
 
   RetrieveRequest request;
+  uint64_t fileSize;
   std::map<std::string,std::pair<uint64_t,TapeFile>> tapeCopies;
 
 }; // struct RetrieveJob

scheduler/OStoreDB/QueueItor.cpp

@@ -210,6 +210,7 @@ getQueueJobs(const jobQueue_t &jobQueueChunk)
         job.tapeCopies[tf.second.vid].second = tf.second;
         job.request.dstURL                   = osrr.first.getSchedulerRequest().dstURL;
         job.request.archiveFileID            = osrr.first.getArchiveFile().archiveFileID;
+        job.fileSize                         = osrr.first.getArchiveFile().fileSize;
 
         m_jobCache.push_back(job);
       }

xroot_plugins/XrdCtaListPendingQueue.hpp

@@ -212,7 +212,7 @@ bool ListPendingQueue<OStoreDB::ArchiveQueueItor_t>::pushRecord(XrdSsiPb::OStrea
 
 template<>
 uint64_t ListPendingQueue<OStoreDB::RetrieveQueueItor_t>::fileSize(const data_t &job) {
-   return 0; //m_catalogue.getArchiveFileById(job.request.archiveFileID).fileSize;
+   return job.fileSize;
 }
 
 template<>
@@ -243,7 +243,7 @@ bool ListPendingQueue<OStoreDB::RetrieveQueueItor_t>::pushRecord(XrdSsiPb::OStre
       auto af = record.mutable_af_item()->mutable_af();
       af->set_archive_id(job.request.archiveFileID);
       //af->set_size(tape_it->second.second.compressedSize);
-      af->set_size(fileSize(job));
+      af->set_size(job.fileSize);
       af->mutable_df()->set_owner(job.request.requester.name);
       af->mutable_df()->set_group(job.request.requester.group);
       af->mutable_df()->set_path(job.request.diskFileInfo.path);