Skip to content

Commit 1620b01

Browse files
committed
Third rebase of xcache purge plugin / resource monitor onto 5.7.3.
Detailed logs (each rebase is squashed into single commit): alja/purge-main-rb1 osschar/xcache-purge-rebase-onto-master-2024-09-10 osschar/xcache-purge-rebase-onto-master-5.7.2-2024-12-05
1 parent 5870e6c commit 1620b01

40 files changed

+3718
-1362
lines changed

docs/ReleaseNotes.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
======
21
XRootD
32
======
43

src/XrdHeaders.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ set( XROOTD_PUBLIC_HEADERS
2626
XrdNet/XrdNetSocket.hh
2727
XrdOuc/XrdOucBuffer.hh
2828
XrdOuc/XrdOucCRC.hh
29+
XrdOuc/XrdOucCache.hh
2930
XrdOuc/XrdOucCacheCM.hh
3031
XrdOuc/XrdOucCacheStats.hh
3132
XrdOuc/XrdOucCallBack.hh

src/XrdOss/XrdOssAt.hh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
/* specific prior written permission of the institution or contributor. */
3131
/******************************************************************************/
3232

33+
#include "XrdOuc/XrdOucEnv.hh"
34+
3335
#include <cstdint>
3436
#include <sys/types.h>
3537

src/XrdPfc.cmake

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
set( LIB_XRD_FILECACHE XrdPfc-${PLUGIN_VERSION} )
66
set( LIB_XRD_FILECACHE_LEGACY XrdFileCache-${PLUGIN_VERSION} )
77
set( LIB_XRD_BLACKLIST XrdBlacklistDecision-${PLUGIN_VERSION} )
8+
set( LIB_XRD_PURGEQUOTA XrdPfcPurgeQuota-${PLUGIN_VERSION} )
89

910
#-------------------------------------------------------------------------------
1011
# Shared library version
@@ -19,7 +20,16 @@ add_library(
1920
XrdPfc/XrdPfcTypes.hh
2021
XrdPfc/XrdPfc.cc XrdPfc/XrdPfc.hh
2122
XrdPfc/XrdPfcConfiguration.cc
23+
XrdPfc/XrdPfcDirStateBase.hh
24+
XrdPfc/XrdPfcDirState.cc XrdPfc/XrdPfcDirState.hh
25+
XrdPfc/XrdPfcDirStateSnapshot.cc XrdPfc/XrdPfcDirStateSnapshot.hh
26+
XrdPfc/XrdPfcFPurgeState.cc XrdPfc/XrdPfcFPurgeState.hh
2227
XrdPfc/XrdPfcPurge.cc
28+
XrdPfc/XrdPfcPurgePin.hh
29+
XrdPfc/XrdPfcDirStatePurgeshot.hh
30+
XrdPfc/XrdPfcResourceMonitor.cc XrdPfc/XrdPfcResourceMonitor.hh
31+
XrdPfc/XrdPfcPathParseTools.hh
32+
XrdPfc/XrdPfcFsTraversal.cc XrdPfc/XrdPfcFsTraversal.hh
2333
XrdPfc/XrdPfcCommand.cc
2434
XrdPfc/XrdPfcFile.cc XrdPfc/XrdPfcFile.hh
2535
XrdPfc/XrdPfcFSctl.cc XrdPfc/XrdPfcFSctl.hh
@@ -33,7 +43,6 @@ add_library(
3343
target_link_libraries(
3444
${LIB_XRD_FILECACHE}
3545
PRIVATE
36-
# XrdPosix
3746
XrdCl
3847
XrdUtils
3948
XrdServer
@@ -53,6 +62,20 @@ target_link_libraries(
5362
XrdUtils
5463
)
5564

65+
#-------------------------------------------------------------------------------
66+
# The XrdPurgeQuota library
67+
#-------------------------------------------------------------------------------
68+
add_library(
69+
${LIB_XRD_PURGEQUOTA}
70+
MODULE
71+
XrdPfc/XrdPfcPurgeQuota.cc)
72+
73+
target_link_libraries(
74+
${LIB_XRD_PURGEQUOTA}
75+
PRIVATE
76+
XrdUtils
77+
)
78+
5679
#-------------------------------------------------------------------------------
5780
# xrdpfc_print
5881
#-------------------------------------------------------------------------------
@@ -81,6 +104,20 @@ install(
81104
COMMAND ln -sf lib${LIB_XRD_FILECACHE}.so lib${LIB_XRD_FILECACHE_LEGACY}.so
82105
WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} )" )
83106

107+
install(
108+
FILES
109+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcPurgePin.hh
110+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcDirStateBase.hh
111+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcDirStatePurgeshot.hh
112+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcStats.hh
113+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcPathParseTools.hh
114+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfc.hh
115+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcFile.hh
116+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcTypes.hh
117+
${CMAKE_CURRENT_SOURCE_DIR}/XrdPfc/XrdPfcInfo.hh
118+
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/xrootd/XrdPfc
119+
)
120+
84121
install(
85122
TARGETS ${LIB_XRD_BLACKLIST}
86123
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )

src/XrdPfc/README

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,24 +114,24 @@ CONFIGURATION
114114

115115
pfc.blocksize: prefetch buffer size, default 1M
116116

117-
pfc.ram [bytes[g]]: maximum allowed RAM usage for caching proxy
117+
pfc.ram [bytes[g]]: maximum allowed RAM usage for caching proxy
118118

119119
pfc.prefetch <n>: prefetch level, default is 10. Value zero disables prefetching.
120120

121121
pfc.diskusage <low> <hig> diskusage boundaries, can be specified relative in percantage or in g or T bytes
122122

123123
pfc.user <username>: username used by XrdOss plugin
124124

125-
pfc.filefragmentmode [fragmentsize <bytes>] -- enable prefetching a unit of a file,
125+
pfc.filefragmentmode [fragmentsize <bytes>] -- enable prefetching a unit of a file,
126126
with default block size
127127

128-
pfc.osslib <lpath> [<params>] path to alternative plign for output file system
128+
pfc.osslib <lpath> [<params>] path to alternative plign for output file system
129129

130130
pfc.decisionlib <lpath> [<prams>] path to decision library and plugin parameters
131131

132132
pfc.trace <none|error|warning|info|debug|dump> default level is warning, xrootd option -d sets debug level
133133

134-
Examples
134+
Examples
135135

136136
a) Enable proxy file prefetching:
137137
pps.cachelib libXrdPfc.so

0 commit comments

Comments
 (0)