Merge pull request #75 from efajardo/xcache-redir

XCache Redir sub package

Makefile

@@ -6,7 +6,7 @@
 # ------------------------------------------------------------------------------
 
 PACKAGE := xcache
-VERSION := 1.1.0
+VERSION := 1.2.0
 
 
 # ------------------------------------------------------------------------------
@@ -20,13 +20,16 @@ INSTALL_LIBEXEC_DIR := usr/libexec/xcache
 XROOTD_CONFIG := $(wildcard configs/atlas-xcache/xrootd/*) \
 		 $(wildcard configs/cms-xcache/xrootd/*) \
 		 $(wildcard configs/stash-cache/xrootd/*) \
-                 $(wildcard configs/xcache/xrootd/*) \
-                 $(wildcard configs/stash-origin/xrootd/*)
+		 $(wildcard configs/xcache/xrootd/*) \
+		 $(wildcard configs/xcache-redir/xrootd/*) \
+		$(wildcard configs/stash-origin/xrootd/*)
+
 
 XROOTD_CONFIGD := $(wildcard configs/atlas-xcache/config.d/*) \
                   $(wildcard configs/cms-xcache/config.d/*) \
                   $(wildcard configs/stash-cache/config.d/*) \
                   $(wildcard configs/xcache/config.d/*) \
+                  $(wildcard configs/xcache-redir/config.d/*) \
                   $(wildcard configs/stash-origin/config.d/*)
 
 SYSTEMD_UNITS := $(wildcard configs/stash-cache/systemd/*) \
@@ -122,6 +125,7 @@ install:
 	mkdir -p $(DESTDIR)/run/stash-origin
 	mkdir -p $(DESTDIR)/run/stash-origin-auth
 	mkdir -p $(DESTDIR)/run/xcache-auth
+	mkdir -p $(DESTDIR)/run/xcache-redir
 	mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
 	install -p -m 0644 $(TMPFILES_D) $(DESTDIR)/usr/lib/tmpfiles.d
 

configs/xcache-redir/config.d/03-redir-tuning.cfg

@@ -0,0 +1,19 @@
+#
+# Tuning configuration for an XCache redirector
+#
+# **********************************************************************
+# * WARNING: DO NOT EDIT THIS FILE.  IT WILL BE OVERWRITTEN ON UPGRADE *
+# **********************************************************************
+#
+# Instead of editing this file,
+# - Override OSG-provided defaults by dropping a site-specific configuration
+#   file in `/etc/xrootd/config.d` and prefixing it with "90-" or higher.
+#
+# Using maxretries 0 to prevent multiple copies of same file in different
+# nodes of the logical cache
+cms.sched maxretries 0 nomultisrc space 100 fuzz 5
+cms.fxhold noloc 15m 4h
+
+xrootd.trace emsg login stall redirect
+xrd.trace conn
+cms.trace defer files redirect stage

configs/xcache-redir/xrootd/xrootd-xcache-redir.cfg

@@ -0,0 +1,24 @@
+#
+# Configure a redirector for a group of XCaches
+#
+# **********************************************************************
+# * WARNING: DO NOT EDIT THIS FILE.  IT WILL BE OVERWRITTEN ON UPGRADE *
+# **********************************************************************
+#
+# Instead of editing this file,
+# - Override OSG-provided defaults by dropping a site-specific configuration
+#   file in `/etc/xrootd/config.d` and prefixing it with "90-" or higher.
+#
+
+# XRootD protocol listening port
+if exec xrootd
+   xrd.port 1094
+fi
+
+if exec cmsd
+   xrd.port 1095
+fi
+
+all.role manager
+# Drop your site-specific configuration additions into this directory.
+continue /etc/xrootd/config.d

configs/xcache/config.d/90-xcache-logging.cfg

@@ -21,3 +21,6 @@ cms.trace all
 # Enable some debugging from the embedded client in the proxy
 # server.
 pss.setopt DebugLevel 1
+
+# Enable more debugging for stashcache
+#http.trace all                                                                                                                                                                                            

rpm/xcache.spec

@@ -1,6 +1,6 @@
 Name:      xcache
 Summary:   XCache scripts and configurations
-Version:   1.1.1
+Version:   1.2.0
 Release:   1%{?dist}
 License:   Apache 2.0
 Group:     Grid
@@ -117,6 +117,19 @@ Requires: xrootd-lcmaps >= 1.5.1
 %postun -n cms-xcache
 %systemd_postun_with_restart [email protected] [email protected]
 
+%package -n xcache-redirector
+Summary: The XCache redirector
+
+Requires: %{name} = %{version}
+%description -n xcache-redirector
+%{summary}
+%post -n xcache-redirector
+%systemd_post [email protected] [email protected]
+%preun -n xcache-redirector
+%systemd_preun [email protected] [email protected]
+%postun -n xcache-redirector
+%systemd_postun_with_restart [email protected] [email protected] 
+
 %prep
 %setup -n %{name}-%{version} -q
 
@@ -203,7 +216,15 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
 %config(noreplace) %{_sysconfdir}/xrootd/config.d/90-cms-xcache-local-redirector.cfg
 %config(noreplace) %{_sysconfdir}/xrootd/config.d/95-cms-xcache-logging.cfg
 
+
+%files -n xcache-redirector
+%config %{_sysconfdir}/xrootd/xrootd-xcache-redir.cfg
+%config %{_sysconfdir}/xrootd/config.d/03-redir-tuning.cfg
+
 %changelog
+* Mon Sep 23 2019 Edgar Fajardo <[email protected]> - 1.2.0-1
+- Adding the subpackage for XCache redirector
+
 * Mon Aug 19 2019 Brian Lin <[email protected]> - 1.1.1-1
 - Restore StashCache HTTP port to 8000