From 431bd26e48dc5b8b8f094d8138f487d81353639e Mon Sep 17 00:00:00 2001 From: Alexander Rogovskiy Date: Tue, 5 Aug 2025 13:51:59 +0100 Subject: [PATCH] feat: redirect traffic to webdav.echo.stfc.ac.uk to local gateway The endpoint in question is used mostly for writing data to ECHO. Local gateways are writable now, so it's preferable to use them instead of external ones (to separate the traffic better and reduce the load on external gws). We also remove xrootd-gateway endpoint since it is no longer needed (local gateways are not used for xrootd uploads due to possible race conditions). --- docker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker.py b/docker.py index 8500aef..fd260ba 100755 --- a/docker.py +++ b/docker.py @@ -50,13 +50,13 @@ def args_create(argv): if gateway(): dargs.append('--label=xrootd-local-gateway=true') dargs.append('--add-host=xrootd.echo.stfc.ac.uk ceph-gw10.gridpp.rl.ac.uk ceph-gw11.gridpp.rl.ac.uk:172.28.1.1') - dargs.append('--add-host=xrootd-gateway.echo.stfc.ac.uk:172.28.1.2') + dargs.append('--add-host=webdav.echo.stfc.ac.uk:172.28.1.2') # Call function to capture primary IPv6 address and assign xrootd alias to local containers IPv6 address. primary_ipv6 = get_primary_ipv6() if primary_ipv6: primary_ipv6 = primary_ipv6.rstrip(':') dargs.append('--add-host=xrootd.echo.stfc.ac.uk ceph-gw10.gridpp.rl.ac.uk ceph-gw11.gridpp.rl.ac.uk:{}{}'.format(primary_ipv6, ':1000:2')) - dargs.append('--add-host=xrootd-gateway.echo.stfc.ac.uk:{}{}'.format(primary_ipv6, ':1000:3')) + dargs.append('--add-host=webdav.echo.stfc.ac.uk:{}{}'.format(primary_ipv6, ':1000:3')) dargs.append('--env=XrdSecGSISRVNAMES=%s' % getfqdn()) dargs.append('--env=APPTAINERENV_XrdSecGSISRVNAMES=%s' % getfqdn()) # Singularity equivalent for backwards compatibility