Skip to content

Use grid-mapfile downloaded from Topology #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matyasselmeci merged 3 commits into from
Mar 20, 2024
Merged

Use grid-mapfile downloaded from Topology #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c559147
Prepend /etc/grid-security/grid-mapfile to the grid-mapfile downloade…
matyasselmeci Mar 18, 2024
2fe841b
Set `GridMapfile` and `GmapOpt` in the XRootD config (SOFTWARE-5468)
matyasselmeci Mar 18, 2024
5ac1688
Skip a local file if it's the same file as the destination file
matyasselmeci Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions configs/xcache/config.d/40-xcache-auth.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,25 @@ if named stash-cache
else
setenv X509_USER_PROXY = /run/xcache-auth/x509_proxy
fi


if defined ?GridMapfile
# pass
else if named stash-cache-auth
set GridMapfile = /run/stash-cache-auth/grid-mapfile
else if named stash-origin-auth
set GridMapfile = /run/stash-origin-auth/grid-mapfile
else
set GridMapfile = /etc/grid-security/grid-mapfile
fi

if defined ?GmapOpt
# pass
else if named stash-cache-auth
set GmapOpt = usemap
else if named stash-origin-auth
set GmapOpt = usemap
else
set GmapOpt = trymap
fi

19 changes: 15 additions & 4 deletions src/authfile-update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,20 @@ class Download:

self.full_destdir = f"{self.destdir}/{self.instance}"
self.dest_file = f"{self.full_destdir}/{self.config_file}"
self.local_files = [
self.local_files = []
if config_file == "grid-mapfile":
# Local additions to the grid-mapfile are prepended, not appended
# to what's downloaded from topology because we want them to "win"
self.prepend_local = True

# Backward compat: also read /etc/grid-security/grid-mapfile
self.local_files.append("/etc/grid-security/grid-mapfile")
else:
self.prepend_local = False
self.local_files += [
f"{self.destdir}/{self.instance}/{self.config_file}.local",
f"/etc/xrootd/{self.instance}-{self.config_file}.local",
]
self.prepend_local = config_file == "grid-mapfile"
# ^^ local additions to the grid-mapfile are prepended, not appended
# to what's downloaded from topology

def fetch(self) -> Tuple[Optional[str], bool]:
"""Download the data for this config file from Topology and return
Expand Down Expand Up @@ -137,6 +144,10 @@ class Download:
new_text = ""
for local_file in self.local_files:
try:
if os.path.samefile(os.path.realpath(local_file), os.path.realpath(self.dest_file)):
# The local file is a symlink to the destination file or something similar.
# Skip it to avoid a loop.
continue
with open(local_file, "rt", encoding="utf-8", errors="replace") as fh:
new_text += (
f"## The following lines are from {local_file}:\n"
Expand Down