[Pfc] Implement async read and readV from the perspective of XrdOucCa…

…cheIO. (#1717) Implement async Read, pgRead, and ReadV. Mark file as complete when final block is successfully written to disk. Perform sync when file is completely downloaded, do not wait for final detach. Adjust default block size down to 128 kB to be closer to async default of 64 kB. Rename class IOEntireFile to IOFile. IO: Use override for virtual methods. File: Cache some frequently used variables in adjacent locations. Info: Coalesce functions SetBufferSize/FileSizeAndCreationTime() into a single function as this all needs to happen at the same time. Put pfc.blocksize into env XRDPFC.SEGSIZE.
xrootd · Jun 7, 2022 · 8caf77f · 8caf77f
1 parent a43982a
commit 8caf77f
Show file tree

Hide file tree

Showing 17 changed files with 1,098 additions and 1,132 deletions.
diff --git a/src/XrdPfc.cmake b/src/XrdPfc.cmake
@@ -23,11 +23,10 @@ add_library(
   XrdPfc/XrdPfcPurge.cc
   XrdPfc/XrdPfcCommand.cc
   XrdPfc/XrdPfcFile.cc          XrdPfc/XrdPfcFile.hh
-  XrdPfc/XrdPfcVRead.cc
   XrdPfc/XrdPfcStats.hh
   XrdPfc/XrdPfcInfo.cc          XrdPfc/XrdPfcInfo.hh
   XrdPfc/XrdPfcIO.cc            XrdPfc/XrdPfcIO.hh
-  XrdPfc/XrdPfcIOEntireFile.cc  XrdPfc/XrdPfcIOEntireFile.hh
+  XrdPfc/XrdPfcIOFile.cc        XrdPfc/XrdPfcIOFile.hh
   XrdPfc/XrdPfcIOFileBlock.cc   XrdPfc/XrdPfcIOFileBlock.hh
   XrdPfc/XrdPfcDecision.hh)
 

diff --git a/src/XrdPfc/XrdPfc.cc b/src/XrdPfc/XrdPfc.cc
@@ -38,7 +38,7 @@
 #include "XrdPfc.hh"
 #include "XrdPfcTrace.hh"
 #include "XrdPfcInfo.hh"
-#include "XrdPfcIOEntireFile.hh"
+#include "XrdPfcIOFile.hh"
 #include "XrdPfcIOFileBlock.hh"
 
 using namespace XrdPfc;
@@ -219,18 +219,18 @@ XrdOucCacheIO *Cache::Attach(XrdOucCacheIO *io, int Options)
       }
       else
       {
-         IOEntireFile *ioef = new IOEntireFile(io, *this);
+         IOFile *iof = new IOFile(io, *this);
 
-         if ( ! ioef->HasFile())
+         if ( ! iof->HasFile())
          {
-           delete ioef;
+           delete iof;
            // TODO - redirect instead. But this is kind of an awkward place for it.
-           // errno is set during IOEntireFile construction.
+           // errno is set during IOFile construction.
            TRACE(Error, tpfx << "Failed opening local file, falling back to remote access " << io->Path());
            return io;
          }
 
-         cio = ioef;
+         cio = iof;
       }
 
       TRACE_PC(Debug, const char* loc = io->Location(), tpfx << io->Path() << " location: " <<

diff --git a/src/XrdPfc/XrdPfcCommand.cc b/src/XrdPfc/XrdPfcCommand.cc
@@ -233,8 +233,7 @@ void Cache::ExecuteCommandUrl(const std::string& command_url)
          // Fill up cinfo.
 
          Info myInfo(m_trace, false);
-         myInfo.SetBufferSize(block_size);
-         myInfo.SetFileSizeAndCreationTime(file_size);
+         myInfo.SetBufferSizeFileSizeAndCreationTime(block_size, file_size);
          myInfo.SetAllBitsSynced();
 
          for (int i = 0; i < at_count; ++i)

diff --git a/src/XrdPfc/XrdPfcConfiguration.cc b/src/XrdPfc/XrdPfcConfiguration.cc
@@ -36,7 +36,7 @@ Configuration::Configuration() :
    m_accHistorySize(20),
    m_dirStatsMaxDepth(-1),
    m_dirStatsStoreDepth(0),
-   m_bufferSize(256*1024),
+   m_bufferSize(128*1024),
    m_RamAbsAvailable(0),
    m_RamKeepStdBlocks(0),
    m_wqueue_blocks(16),
@@ -303,7 +303,7 @@ bool Cache::Config(const char *config_filename, const char *parameters)
    // Adjust default parameters for client/serverless caching
    if (m_isClient)
    {
-      m_configuration.m_bufferSize     = 256 * 1024;
+      m_configuration.m_bufferSize     = 128 * 1024; // same as normal.
       m_configuration.m_wqueue_blocks  = 8;
       m_configuration.m_wqueue_threads = 1;
    }
@@ -532,6 +532,8 @@ bool Cache::Config(const char *config_filename, const char *parameters)
       }
 
       m_log.Say(buff);
+
+      m_env->Put("XRDPFC.SEGSIZE", std::to_string(m_configuration.m_bufferSize).c_str());
    }
 
    // Derived settings