diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp index d7aa73109d54e8d1205d892e9976960b3de7ff23..532f88128ab0c22b2a72f51fb1507712bff828f3 100644 --- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp +++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp @@ -815,8 +815,9 @@ TEST_P(DataTransferSessionTest, DataTransferSessionRAORecall) { } if (add_expected) { std::stringstream expectedLogLine; - std::copy(expectedOrder.begin(), expectedOrder.end(), - std::ostream_iterator<int>(expectedLogLine, " ")); + for(const auto &fseq: expectedOrder) { + expectedLogLine << " " << fseq; + } expectedFseqOrderLog.push_back(expectedLogLine.str()); expectedOrder.clear(); } diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp index 13a5b695860facfda9b589c489627cdb18d15196..1bb4914432bc45b6ae8750a4e997767a88ab7585 100644 --- a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp +++ b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp @@ -164,12 +164,18 @@ void RecallTaskInjector::injectBulkRecalls() { files.clear(); } - std::string queryOrderLog = "Query fseq order:"; + std::ostringstream recallOrderLog; + if(m_useRAO) { + recallOrderLog << "Recall order of FSEQs using RAO:"; + } else { + recallOrderLog << "Recall order of FSEQs:"; + } + for (uint32_t i = 0; i < njobs; i++) { uint32_t index = m_useRAO ? raoOrder.at(i) : i; cta::RetrieveJob *job = m_jobs.at(index).release(); - queryOrderLog += std::to_string(job->selectedTapeFile().fSeq) + " "; + recallOrderLog << " " << job->selectedTapeFile().fSeq; job->positioningMethod=cta::PositioningMethod::ByBlock; @@ -190,7 +196,7 @@ void RecallTaskInjector::injectBulkRecalls() { m_tapeReader.push(trt); m_lc.log(cta::log::INFO, "Created tasks for recalling a file"); } - m_lc.log(cta::log::INFO, queryOrderLog); + m_lc.log(cta::log::INFO, recallOrderLog.str()); m_jobs.clear(); LogContext::ScopedParam sp03(m_lc, Param("nbFile", m_jobs.size())); m_lc.log(cta::log::INFO, "Finished processing batch of recall tasks from client");