Skip to content

Commit c17a5ff

Browse files
matyasselmecimatyasselmeci
committed
Remove stash-origin and stash-cache
These were symlinks in atlas-xcache and cms-xcache to some files in stash-cache. These were turned into regular files.
1 parent 24d7277 commit c17a5ff

30 files changed

Lines changed: 339 additions & 704 deletions

‎Makefile‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# ------------------------------------------------------------------------------
77

88
PACKAGE := xcache
9-
VERSION := 3.5.0
9+
VERSION := 4.0.0
1010

1111

1212
# ------------------------------------------------------------------------------
@@ -21,27 +21,19 @@ LIBEXEC_FILES := src/xcache-reporter \
2121
INSTALL_LIBEXEC_DIR := usr/libexec/xcache
2222
XROOTD_CONFIG := $(wildcard configs/atlas-xcache/xrootd/*) \
2323
$(wildcard configs/cms-xcache/xrootd/*) \
24-
$(wildcard configs/stash-cache/xrootd/*) \
2524
$(wildcard configs/xcache/xrootd/*) \
2625
$(wildcard configs/xcache-redir/xrootd/*) \
27-
$(wildcard configs/stash-origin/xrootd/*)
2826

2927

3028
XROOTD_CONFIGD := $(wildcard configs/atlas-xcache/config.d/*) \
3129
$(wildcard configs/cms-xcache/config.d/*) \
32-
$(wildcard configs/stash-cache/config.d/*) \
3330
$(wildcard configs/xcache/config.d/*) \
3431
$(wildcard configs/xcache-redir/config.d/*) \
35-
$(wildcard configs/stash-origin/config.d/*)
3632

37-
SYSTEMD_UNITS := $(wildcard configs/stash/systemd/*) \
38-
$(wildcard configs/xcache/systemd/*) \
39-
$(wildcard configs/stash-origin/systemd/*) \
33+
SYSTEMD_UNITS := $(wildcard configs/xcache/systemd/*) \
4034
$(wildcard configs/xcache-consistency-check/systemd/*)
4135

42-
TMPFILES_D := configs/stash-cache/tmpfiles/stash-cache.conf \
43-
configs/stash-origin/tmpfiles/stash-origin.conf \
44-
configs/xcache/tmpfiles/xcache.conf
36+
TMPFILES_D := configs/xcache/tmpfiles/xcache.conf
4537

4638
INSTALL_XROOTD_DIR := etc/xrootd
4739
INSTALL_SYSTEMD_UNITDIR := usr/lib/systemd/system
@@ -89,8 +81,6 @@ install:
8981
mkdir -p $(DESTDIR)/$(INSTALL_XROOTD_DIR)
9082
# XRootD configuration files
9183
install -p -m 0644 $(XROOTD_CONFIG) $(DESTDIR)/$(INSTALL_XROOTD_DIR)
92-
ln -srf $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-cache.cfg $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-cache-auth.cfg
93-
ln -srf $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-origin.cfg $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-origin-auth.cfg
9484
mkdir -p $(DESTDIR)/$(INSTALL_XROOTD_DIR)/config.d
9585
install -p -m 0644 $(XROOTD_CONFIGD) $(DESTDIR)/$(INSTALL_XROOTD_DIR)/config.d
9686
# XCache Consistency Check
@@ -103,26 +93,6 @@ install:
10393
install -p -m 0644 $(SYSTEMD_UNITS) $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)
10494
# systemd unit overrides
10595
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd-renew-proxy.service.d
106-
# stash-cache
107-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-cache.service.d
108-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-cache-auth.service.d
109-
install -p -m 0644 configs/stash-cache/overrides/10-stash-cache-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-cache.service.d/
110-
install -p -m 0644 configs/stash-cache/overrides/10-stash-cache-auth-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-cache-auth.service.d/
111-
# stash-origin
112-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-origin.service.d
113-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-origin-auth.service.d
114-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd@stash-origin.service.d
115-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd@stash-origin-auth.service.d
116-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd-privileged@stash-origin-auth.service.d
117-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd-multiuser@stash-origin-auth.service.d
118-
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd-privileged@stash-origin-auth.service.d
119-
install -p -m 0644 configs/stash-origin/systemd/cmsd-multiuser@.service $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd-multiuser@.service
120-
install -p -m 0644 configs/stash-origin/overrides/xrootd/10-stash-origin-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-origin.service.d/
121-
install -p -m 0644 configs/stash-origin/overrides/xrootd/10-stash-origin-auth-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@stash-origin-auth.service.d/
122-
install -p -m 0644 configs/stash-origin/overrides/xrootd-privileged/10-stash-origin-auth-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd-privileged@stash-origin-auth.service.d/
123-
install -p -m 0644 configs/stash-origin/overrides/cmsd/10-stash-origin-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd@stash-origin.service.d/
124-
install -p -m 0644 configs/stash-origin/overrides/cmsd/10-stash-origin-auth-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd@stash-origin-auth.service.d/
125-
install -p -m 0644 configs/stash-origin/overrides/cmsd-privileged/10-stash-origin-auth-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd-privileged@stash-origin-auth.service.d/
12696
# atlas-xcache
12797
mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@atlas-xcache.service.d
12898
install -p -m 0644 configs/atlas-xcache/overrides/10-atlas-xcache-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd@atlas-xcache.service.d/
@@ -134,10 +104,6 @@ install:
134104
install -p -m 0644 configs/cms-xcache/overrides/cmsd/10-cms-xcache-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/cmsd@cms-xcache.service.d/
135105
install -p -m 0644 configs/cms-xcache/overrides/xrootd-renew-proxy/10-cms-refresh-proxy-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd-renew-proxy.service.d/
136106
# systemd tempfiles
137-
mkdir -p $(DESTDIR)/run/stash-cache
138-
mkdir -p $(DESTDIR)/run/stash-cache-auth
139-
mkdir -p $(DESTDIR)/run/stash-origin
140-
mkdir -p $(DESTDIR)/run/stash-origin-auth
141107
mkdir -p $(DESTDIR)/run/xcache-auth
142108
mkdir -p $(DESTDIR)/run/xcache-redir
143109
mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d

‎configs/atlas-xcache/config.d/40-atlas-xcache-plugin.cfg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎configs/atlas-xcache/config.d/40-atlas-xcache-plugin.cfg‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
#
2+
# Configure XRootD Caching Proxy (`XCache`) for OSG deploys.
3+
#
4+
# **********************************************************************
5+
# * WARNING: DO NOT EDIT THIS FILE. IT WILL BE OVERWRITTEN ON UPGRADE *
6+
# **********************************************************************
7+
#
8+
# This file is part of the XCache Daemon
9+
10+
# Set default values for the cache plugin
11+
set eBLOCKSIZE=512k
12+
set ePREFETCH=10
13+
set eRAMSIZE=1g
14+
set eSPACELOWWM=0.90
15+
set eSPACEHIGHWM=0.95
16+
set eWQBLOCKS=10
17+
set eWQTHREADS=2
18+
19+
# Load the correct libraries for XCache to operate:
20+
# First, the proxy library itself.
21+
if exec xrootd
22+
# Only Xrootd should be using osslib not cmsd
23+
ofs.osslib libXrdPss.so
24+
# Second, the cache underlying the proxy.
25+
pss.cachelib libXrdPfc.so
26+
fi
27+
28+
# This is need so the redir does not have to think too much
29+
# the next request whichone to assign it to
30+
if exec cmsd
31+
cms.space 0
32+
fi
33+
34+
if named atlas-xcache
35+
# Set ATLAS defaults
36+
set eRAMSIZE=16g
37+
set eBLOCKSIZE=1M
38+
set ePREFETCH=0
39+
40+
# Allows the client to set the origin
41+
# http://xrootd.org/doc/dev49/pss_config.htm#
42+
pss.origin =
43+
44+
# Load the Rucio namespace-mapping plugin
45+
pss.namelib -lfncache /usr/lib64/XrdName2NameDCP4RUCIO.so
46+
else if named cms-xcache
47+
pss.origin cmsxrootd.fnal.gov:1094
48+
49+
xrd.network keepalive kaparms 10m,1m,5
50+
xrd.timeout idle 60m
51+
else
52+
pss.origin redirector.osgstorage.org:1094
53+
54+
# Tune the client timeouts to more aggressively timeout.
55+
pss.setopt ParallelEvtLoop 10
56+
pss.setopt RequestTimeout 25
57+
pss.setopt ConnectTimeout 25
58+
pss.setopt ConnectionRetry 2
59+
fi
60+
61+
# Allow environment variable override of redirector
62+
if defined ?~XC_REDIRECTOR
63+
set eREDIRECTOR=$XC_REDIRECTOR
64+
pss.origin $eREDIRECTOR
65+
fi
66+
67+
# Cache plugin parameters
68+
#
69+
# The default values here should be sufficient for most use cases. To change them, override them
70+
# by setting the XC_BLOCKSIZE, XC_PREFETCH, XC_RAMSIZE, XC_SPACE_LOW_WM, XC_SPACE_HIGH_WM
71+
# environment variables for the XRootD processes
72+
73+
if defined ?~XC_BLOCKSIZE
74+
set eBLOCKSIZE=$XC_BLOCKSIZE
75+
fi
76+
77+
if defined ?~XC_PREFETCH
78+
set ePREFETCH=$XC_PREFETCH
79+
fi
80+
81+
if defined ?~XC_RAMSIZE
82+
set eRAMSIZE=$XC_RAMSIZE
83+
fi
84+
85+
if defined ?~XC_SPACE_LOW_WM
86+
set eSPACELOWWM=$XC_SPACE_LOW_WM
87+
fi
88+
89+
if defined ?~XC_SPACE_HIGH_WM
90+
set eSPACEHIGHWM=$XC_SPACE_HIGH_WM
91+
fi
92+
93+
if defined ?~XC_WQ_BLOCKS_PER_LOOP
94+
set eWQBLOCKS=$XC_WQ_BLOCKS_PER_LOOP
95+
fi
96+
97+
if defined ?~XC_WQ_THREADS
98+
set eWQTHREADS=$XC_WQ_THREADS
99+
fi
100+
101+
# The size of the blocks in cache; all reads to the data federation
102+
# will be rounded along these boundaries.
103+
pfc.blocksize $eBLOCKSIZE
104+
# Amount of memory to use for blocks in flight; this is NOT a RAM cache,
105+
# just a temporary buffer.
106+
# 1GB is 200 files concurrently downloaded with 10 prefetch blocks.
107+
pfc.ram $eRAMSIZE
108+
# Number of blocks to prefetch from a file at once.
109+
pfc.prefetch $ePREFETCH
110+
# The low-water and high-water marks for the disk usage; once disk usage
111+
# goes above the high-water mark, the cache deletes until it hits the low-water
112+
# mark.
113+
pfc.diskusage $eSPACELOWWM $eSPACEHIGHWM
114+
# A number of blocks to write in parallel and number of writing threads
115+
# For spinning disks more is better up to the number of spindles in your system
116+
# For NVMe' it is not so critical.
117+
pfc.writequeue $eWQBLOCKS $eWQTHREADS
118+
119+
if named stash-cache
120+
xrd.tcpmonlib /usr/lib64/libXrdTCPStats.so
121+
else if named stash-cache-auth
122+
xrd.tcpmonlib /usr/lib64/libXrdTCPStats.so
123+
fi
124+

‎configs/atlas-xcache/config.d/90-atlas-xcache-disks.cfg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎configs/atlas-xcache/config.d/90-atlas-xcache-disks.cfg‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
# Configure disks for cache servers for data federations in the OSG
3+
#
4+
# ************************************************************
5+
# * NOTE: Changes to this file will be PRESERVED on upgrades *
6+
# ************************************************************
7+
#
8+
# This file is part of the XCache Daemon
9+
10+
# To improve performance and expand the size of your cache , uncomment
11+
# the following 'pfc.spaces' line and specify 'oss.space data' and
12+
# 'oss.space meta' paths below:
13+
#
14+
# pfc.spaces data meta
15+
16+
# Specify 'oss.space data' to distribute data files across the
17+
# specified filesystem locations. Can be specified more than once with
18+
# the following format:
19+
#
20+
# oss.space data <ABSOLUTE PATH>
21+
#
22+
# For example:
23+
#
24+
# oss.space data /data1/xcache
25+
# oss.space data /data2/xcache
26+
# oss.space data /data3/xcache
27+
# ...
28+
29+
# Specify 'oss.space meta' to distribute metadata files across the
30+
# specified filesystem locations. For improved performance, we
31+
# recommend placing metadata files on an SSD or NVMe. Can be specified
32+
# more than once with the following format:
33+
#
34+
# oss.space meta <ABSOLUTE PATH>
35+
#
36+
# For example:
37+
#
38+
# oss.space meta /meta1/xcache
39+
# oss.space meta /meta2/xcache
40+
# oss.space meta /meta3/xcache
41+
# ...

‎configs/cms-xcache/config.d/40-cms-xcache-plugin.cfg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎configs/cms-xcache/config.d/40-cms-xcache-plugin.cfg‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
#
2+
# Configure XRootD Caching Proxy (`XCache`) for OSG deploys.
3+
#
4+
# **********************************************************************
5+
# * WARNING: DO NOT EDIT THIS FILE. IT WILL BE OVERWRITTEN ON UPGRADE *
6+
# **********************************************************************
7+
#
8+
# This file is part of the XCache Daemon
9+
10+
# Set default values for the cache plugin
11+
set eBLOCKSIZE=512k
12+
set ePREFETCH=10
13+
set eRAMSIZE=1g
14+
set eSPACELOWWM=0.90
15+
set eSPACEHIGHWM=0.95
16+
set eWQBLOCKS=10
17+
set eWQTHREADS=2
18+
19+
# Load the correct libraries for XCache to operate:
20+
# First, the proxy library itself.
21+
if exec xrootd
22+
# Only Xrootd should be using osslib not cmsd
23+
ofs.osslib libXrdPss.so
24+
# Second, the cache underlying the proxy.
25+
pss.cachelib libXrdPfc.so
26+
fi
27+
28+
# This is need so the redir does not have to think too much
29+
# the next request whichone to assign it to
30+
if exec cmsd
31+
cms.space 0
32+
fi
33+
34+
if named atlas-xcache
35+
# Set ATLAS defaults
36+
set eRAMSIZE=16g
37+
set eBLOCKSIZE=1M
38+
set ePREFETCH=0
39+
40+
# Allows the client to set the origin
41+
# http://xrootd.org/doc/dev49/pss_config.htm#
42+
pss.origin =
43+
44+
# Load the Rucio namespace-mapping plugin
45+
pss.namelib -lfncache /usr/lib64/XrdName2NameDCP4RUCIO.so
46+
else if named cms-xcache
47+
pss.origin cmsxrootd.fnal.gov:1094
48+
49+
xrd.network keepalive kaparms 10m,1m,5
50+
xrd.timeout idle 60m
51+
else
52+
pss.origin redirector.osgstorage.org:1094
53+
54+
# Tune the client timeouts to more aggressively timeout.
55+
pss.setopt ParallelEvtLoop 10
56+
pss.setopt RequestTimeout 25
57+
pss.setopt ConnectTimeout 25
58+
pss.setopt ConnectionRetry 2
59+
fi
60+
61+
# Allow environment variable override of redirector
62+
if defined ?~XC_REDIRECTOR
63+
set eREDIRECTOR=$XC_REDIRECTOR
64+
pss.origin $eREDIRECTOR
65+
fi
66+
67+
# Cache plugin parameters
68+
#
69+
# The default values here should be sufficient for most use cases. To change them, override them
70+
# by setting the XC_BLOCKSIZE, XC_PREFETCH, XC_RAMSIZE, XC_SPACE_LOW_WM, XC_SPACE_HIGH_WM
71+
# environment variables for the XRootD processes
72+
73+
if defined ?~XC_BLOCKSIZE
74+
set eBLOCKSIZE=$XC_BLOCKSIZE
75+
fi
76+
77+
if defined ?~XC_PREFETCH
78+
set ePREFETCH=$XC_PREFETCH
79+
fi
80+
81+
if defined ?~XC_RAMSIZE
82+
set eRAMSIZE=$XC_RAMSIZE
83+
fi
84+
85+
if defined ?~XC_SPACE_LOW_WM
86+
set eSPACELOWWM=$XC_SPACE_LOW_WM
87+
fi
88+
89+
if defined ?~XC_SPACE_HIGH_WM
90+
set eSPACEHIGHWM=$XC_SPACE_HIGH_WM
91+
fi
92+
93+
if defined ?~XC_WQ_BLOCKS_PER_LOOP
94+
set eWQBLOCKS=$XC_WQ_BLOCKS_PER_LOOP
95+
fi
96+
97+
if defined ?~XC_WQ_THREADS
98+
set eWQTHREADS=$XC_WQ_THREADS
99+
fi
100+
101+
# The size of the blocks in cache; all reads to the data federation
102+
# will be rounded along these boundaries.
103+
pfc.blocksize $eBLOCKSIZE
104+
# Amount of memory to use for blocks in flight; this is NOT a RAM cache,
105+
# just a temporary buffer.
106+
# 1GB is 200 files concurrently downloaded with 10 prefetch blocks.
107+
pfc.ram $eRAMSIZE
108+
# Number of blocks to prefetch from a file at once.
109+
pfc.prefetch $ePREFETCH
110+
# The low-water and high-water marks for the disk usage; once disk usage
111+
# goes above the high-water mark, the cache deletes until it hits the low-water
112+
# mark.
113+
pfc.diskusage $eSPACELOWWM $eSPACEHIGHWM
114+
# A number of blocks to write in parallel and number of writing threads
115+
# For spinning disks more is better up to the number of spindles in your system
116+
# For NVMe' it is not so critical.
117+
pfc.writequeue $eWQBLOCKS $eWQTHREADS
118+
119+
if named stash-cache
120+
xrd.tcpmonlib /usr/lib64/libXrdTCPStats.so
121+
else if named stash-cache-auth
122+
xrd.tcpmonlib /usr/lib64/libXrdTCPStats.so
123+
fi
124+

‎configs/cms-xcache/config.d/90-cms-xcache-disks.cfg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)