Skip to content

More efficient mountpoint extraction #7

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
merged 1 commit into from
Aug 13, 2025
Merged

More efficient mountpoint extraction #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions cvmfs-client-prometheus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ mountpoint_for_cvmfs_repo() {
cvmfs_talk -i "${reponame}" mountpoint
}

mountpoint_for_cvmfs_repo_standard() {
echo "/cvmfs/${reponame}"
}

fqrn_for_cvmfs_repo() {
local reponame
reponame="$1"
Expand Down Expand Up @@ -130,7 +134,7 @@ get_cvmfs_repo_metrics() {
reponame="$1"

local repomountpoint
repomountpoint=$(mountpoint_for_cvmfs_repo "${reponame}")
repomountpoint=$($MOUNTPOINT_FUNCTION "${reponame}")

local fqrn
fqrn=$(fqrn_for_cvmfs_repo "${reponame}")
Expand Down Expand Up @@ -247,7 +251,7 @@ get_cvmfs_repo_metrics_new() {
reponame="$1"

local repomountpoint
repomountpoint=$(mountpoint_for_cvmfs_repo "${reponame}")
repomountpoint=$($MOUNTPOINT_FUNCTION "${reponame}")

# Use the new "metrics prometheus" command to get most metrics
cvmfs_talk -i "${reponame}" "metrics prometheus" >> "${TMPFILE}"
Expand Down Expand Up @@ -353,8 +357,10 @@ fi
# Get repository list based on selected method
if [[ "${USE_NON_STANDARD_MOUNTPOINTS}" == 'TRUE' ]]; then
REPO_LIST=$(get_repos_from_cvmfs_config)
MOUNTPOINT_FUNCTION="mountpoint_for_cvmfs_repo"
else
REPO_LIST=$(get_repos_from_findmnt)
MOUNTPOINT_FUNCTION="mountpoint_for_cvmfs_repo_standard"
fi

for REPO in $REPO_LIST; do
Expand Down