Initial rebase of alja/purge-main-rb1 onto master.

Some conflict during rebasr, assumingly due to commit on master: [Server] Commit remaining files/patches for inadvertent commit c29ef89
osschar · Sep 10, 2024 · e065599 · e065599
1 parent bd64e96
commit e065599
Show file tree

Hide file tree

Showing 37 changed files with 3,488 additions and 1,305 deletions.
diff --git a/docs/ReleaseNotes.txt b/docs/ReleaseNotes.txt
@@ -5,6 +5,57 @@ XRootD
 Release Notes
 =============
 
+-------------
+Version 5.7.1
+-------------
+
++ **New Features**
+  **[Apps]** Allow cconfig to write out combined config file (issue #1894)
+  **[Pss]** Allow for API endpoints for fixed remote origins (issue #2068)
+  **[Protocol]** Allow kXR_query to return proxy origin value, for proxy servers
+  **[Protocol]** Define readv limits
+  **[Protocol]** Indicate whether or not server has a cache in kXR_Protocol response
+  **[Server]** Allow server to assume an arbitrary network identity (issue #1855)
+  **[cmsd]** Allow a redirector to be configured read/only (issue #1764)
+  **[systemd]** Harden systemd service units for better security (issue #2033)
+
++ **Major bug fixes**
+  **[POSIX]** Do not leak file pointer on open error (issue #2302)
+  **[Python]** Fix memory leaks when creating Python objects (#2324)
+  **[Secgsi]** Ensure correct certificate is used when passed via cgi with `xrd.gsiusrproxy=...` (issue #2292)
+  **[XrdCl]** Fix too few arguments to formatting function
+
++ **Minor bug fixes**
+  **[POSIX]** Suppress error message when tearing down client connections (issue #2288)
+  **[Secgsi]** Fix code to follow documentation (issue #1817)
+  **[Seckrb5]** Improve error messages and use const where needed (issue #1948)
+  **[Server]** Allow more flexibility in adminpath permissions (issue #2276)
+  **[XrdCl]** Fix hidden overloaded virtual compilation error (#2291)
+  **[XrdCl]** Redact tokens in client logs (issue #2296)
+  **[XrdCl]** xrdfs: Fix typos in command line help string (issue #2323)
+  **[XrdHttp]** Fix CodeQL warning for overrunning write
+  **[XrdNet]** Avoid network identity failures (issue #1772, #2159)
+  **[XrdPfc]** Make sure direct vread requests conform to protocol limits (issue #2308)
+  **[XrdSecgsi]** Fix potential double free in GetSrvCertEnt()
+  **[XrdSecztn]** Fix potential use after free
+
++ **Miscellaneous**
+  **[CMake]** Update CMake minimum requirement and supported versions
+  **[CMake]** Update test.cmake options for coverage builds
+  **[Misc]** Add SECURITY.md file describing XRootD security policy
+  **[Pss]** Export the final origin url for subprocess use
+  **[Tests]** Add new XRootD client/server test configurations
+  **[XrdApps]** Replace pragma once with header guards
+  **[XrdClHttp]** Conditionally load Davix grid module
+  **[XrdCl]** Add flag to optionally suppress force disconnect error messages
+  **[XrdHttp]** Apply keepalive when redirecting HTTP clients (#2290)
+  **[XrdNet]** Make sure domain value is defined
+  **[XrdNet]** Use lower case version of host names
+  **[XrdSys]** Determine `IOV_MAX` at runtime
+  **[XrdSys]** Dump coverage information on `SIGTERM`
+  **[XrdTpc]** Replace pragma once with header guards
+  **[docker]** Update CentOS 7 Dockerfile to use CentOS 7 Vault
+
 -------------
 Version 5.7.0
 -------------

diff --git a/src/XrdHeaders.cmake b/src/XrdHeaders.cmake
@@ -26,6 +26,7 @@ set( XROOTD_PUBLIC_HEADERS
   XrdNet/XrdNetSocket.hh
   XrdOuc/XrdOucBuffer.hh
   XrdOuc/XrdOucCRC.hh
+  XrdOuc/XrdOucCache.hh
   XrdOuc/XrdOucCacheCM.hh
   XrdOuc/XrdOucCacheStats.hh
   XrdOuc/XrdOucCallBack.hh

diff --git a/src/XrdOss/XrdOssAt.hh b/src/XrdOss/XrdOssAt.hh
@@ -30,6 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
+#include "XrdOuc/XrdOucEnv.hh"
+
 #include <cstdint>
 #include <sys/types.h>
 

diff --git a/src/XrdPfc.cmake b/src/XrdPfc.cmake
@@ -5,6 +5,7 @@
 set( LIB_XRD_FILECACHE  XrdPfc-${PLUGIN_VERSION} )
 set( LIB_XRD_FILECACHE_LEGACY XrdFileCache-${PLUGIN_VERSION} )
 set( LIB_XRD_BLACKLIST  XrdBlacklistDecision-${PLUGIN_VERSION} )
+set( LIB_XRD_PURGEQUOTA  XrdPfcPurgeQuota-${PLUGIN_VERSION} )
 
 #-------------------------------------------------------------------------------
 # Shared library version
@@ -15,11 +16,18 @@ set( LIB_XRD_BLACKLIST  XrdBlacklistDecision-${PLUGIN_VERSION} )
 #-------------------------------------------------------------------------------
 add_library(
   ${LIB_XRD_FILECACHE}
-  MODULE
+  SHARED
   XrdPfc/XrdPfcTypes.hh
   XrdPfc/XrdPfc.cc              XrdPfc/XrdPfc.hh
   XrdPfc/XrdPfcConfiguration.cc
+  XrdPfc/XrdPfcDirState.cc      XrdPfc/XrdPfcDirState.hh
+  XrdPfc/XrdPfcDirStateSnapshot.cc      XrdPfc/XrdPfcDirStateSnapshot.hh
+  XrdPfc/XrdPfcFPurgeState.cc   XrdPfc/XrdPfcFPurgeState.hh
   XrdPfc/XrdPfcPurge.cc
+  XrdPfc/XrdPfcPurgePin.hh
+  XrdPfc/XrdPfcResourceMonitor.cc XrdPfc/XrdPfcResourceMonitor.hh
+  XrdPfc/XrdPfcPathParseTools.hh
+  XrdPfc/XrdPfcFsTraversal.cc   XrdPfc/XrdPfcFsTraversal.hh
   XrdPfc/XrdPfcCommand.cc
   XrdPfc/XrdPfcFile.cc          XrdPfc/XrdPfcFile.hh
   XrdPfc/XrdPfcFSctl.cc         XrdPfc/XrdPfcFSctl.hh
@@ -53,6 +61,21 @@ target_link_libraries(
   XrdUtils
   )
 
+#-------------------------------------------------------------------------------
+# The XrdPurgeQuota library
+#-------------------------------------------------------------------------------
+add_library(
+  ${LIB_XRD_PURGEQUOTA}
+  MODULE
+  XrdPfc/XrdPfcPurgeQuota.cc)
+
+target_link_libraries(
+    ${LIB_XRD_PURGEQUOTA}
+    PRIVATE
+    XrdUtils
+    ${LIB_XRD_FILECACHE}
+    )
+
 #-------------------------------------------------------------------------------
 # xrdpfc_print
 #-------------------------------------------------------------------------------
@@ -81,6 +104,19 @@ install(
       COMMAND ln -sf lib${LIB_XRD_FILECACHE}.so lib${LIB_XRD_FILECACHE_LEGACY}.so
       WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} )" )
 
+install(
+  FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcPurgePin.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcDirStateSnapshot.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcDirState.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcStats.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfc.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcFile.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcTypes.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcInfo.hh
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/xrootd/XrdPfc
+)
+
 install(
   TARGETS ${LIB_XRD_BLACKLIST}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )

diff --git a/src/XrdPfc/README b/src/XrdPfc/README
@@ -114,24 +114,24 @@ CONFIGURATION
 
 pfc.blocksize: prefetch buffer size, default 1M
 
-pfc.ram [bytes[g]]: maximum allowed RAM usage for caching proxy 
+pfc.ram [bytes[g]]: maximum allowed RAM usage for caching proxy
 
 pfc.prefetch <n>: prefetch level, default is 10. Value zero disables prefetching.
 
 pfc.diskusage <low> <hig> diskusage boundaries, can be specified relative in percantage or in g or T bytes
 
 pfc.user <username>: username used by XrdOss plugin
 
-pfc.filefragmentmode [fragmentsize <bytes>] -- enable prefetching a unit of a file, 
+pfc.filefragmentmode [fragmentsize <bytes>] -- enable prefetching a unit of a file,
 with default block size
 
-pfc.osslib <lpath> [<params>] path to alternative plign for output file system 
+pfc.osslib <lpath> [<params>] path to alternative plign for output file system
 
 pfc.decisionlib <lpath> [<prams>] path to decision library and plugin parameters
 
 pfc.trace <none|error|warning|info|debug|dump> default level is warning, xrootd option -d sets debug level
 
-Examples 
+Examples
 
 a) Enable proxy file prefetching:
 pps.cachelib libXrdPfc.so