[Server] Rename pfcache export attribute to be simply "cache".

xrootd · Jun 3, 2020 · 1c27a86 · 1c27a86
1 parent 4b51ea2
commit 1c27a86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/XrdOss/XrdOssConfig.cc b/src/XrdOss/XrdOssConfig.cc
@@ -474,7 +474,7 @@ void XrdOssSys::ConfigCache(XrdSysError &Eroute, bool pass2)
      unsigned long long oflag, pflag;
 
 // If this is pass 2 then if we are in pfcMode, then reset r/o flag to r/w
-// to allow the pfc to actually write into the pfcache paths.
+// to allow the pfc to actually write into the cache paths.
 //
    if (pass2)
       {if (pfcMode)
@@ -2027,14 +2027,14 @@ void XrdOssSys::List_Path(const char *pfx, const char *pname,
      if (flags & XRDEXP_GLBLRO)  ss += " globalro";
 
      if (!(flags & XRDEXP_PFCACHE))
-        {if (flags & XRDEXP_PFCACHE_X) ss += " nopfcache";
+        {if (flags & XRDEXP_PFCACHE_X) ss += " nocache";
          ss += (flags & XRDEXP_NOCHECK  ? " nocheck" : " check");
          ss += (flags & XRDEXP_NODREAD  ? " nodread" : " dread");
          ss += (flags & XRDEXP_MIG      ? " mig"     : " nomig");
          ss += (flags & XRDEXP_PURGE    ? " purge"   : " nopurge");
          ss += (flags & XRDEXP_RCREATE  ? " rcreate" : " norcreate");
          ss += (flags & XRDEXP_STAGE    ? " stage"   : " nostage");
-        } else ss += " pfcache";
+        } else ss += " cache";
 
 
      if (flags & XRDEXP_MMAP)

diff --git a/src/XrdOuc/XrdOucExport.cc b/src/XrdOuc/XrdOucExport.cc
@@ -75,8 +75,8 @@ unsigned long long XrdOucExport::ParseDefs(XrdOucStream      &Config,
         {"r/w",           XRDEXP_NOTRW,   0,              XRDEXP_ROW_X},
         {"inplace",       0,              XRDEXP_INPLACE, XRDEXP_INPLACE_X},
         {"outplace",      XRDEXP_INPLACE, 0,              XRDEXP_INPLACE_X},
-//      {"nopfcache",     XRDEXP_PFCACHE, 0,              XRDEXP_PFCACHE_X},
-        {"pfcache",       0,              XRDEXP_PFCACHE, XRDEXP_PFCACHE_X},
+//      {"nocache",       XRDEXP_PFCACHE, 0,              XRDEXP_PFCACHE_X},
+        {"cache",         0,              XRDEXP_PFCACHE, XRDEXP_PFCACHE_X},
         {"nomig",         XRDEXP_MIG,     0,              XRDEXP_MIG_X},
         {"mig",           0,              XRDEXP_MIG,     XRDEXP_MIG_X},
         {"notmigratable", XRDEXP_MIG,     0,              XRDEXP_MIG_X},
@@ -142,6 +142,7 @@ unsigned long long XrdOucExport::ParseDefs(XrdOucStream      &Config,
 
              <path>    the path prefix that applies
              <options> a blank separated list of options:
+                       [no]cache    - is [not] file caching
                        [no]check    - [don't] check if new file exists in MSS
                        [no]dread    - [don't] read actual directory contents
                            forcero  - force r/w opens to r/o opens
@@ -154,7 +155,6 @@ unsigned long long XrdOucExport::ParseDefs(XrdOucStream      &Config,
                        [no]mkeep    - this is [not] a memory keepable name space
                        [no]mlock    - this is [not] a memory lockable name space
                        [no]mmap     - this is [not] a memory mappable name space
-                       [no]pfcache  - [isn't] proxy file cache space
                        [no]rcreate  - [don't] create file in MSS as well
                            r/o      - do not allow modifications (read/only)
                            r/w      - path is writable/modifiable