Skip to content
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

[main] CP- update main branch with mount more than 20 accounts #155

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[main] CP- update main branch with mount more than 20 accounts #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a7f1f
CP- update main branch
palashvij-msft Jan 1, 2025
cf88e5d
update syntax
palashvij-msft Jan 1, 2025
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
2 changes: 2 additions & 0 deletions src/mount.aznfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

int main(int argc, char *argv[])
{
unsetenv("BASH_ENV");
setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", 1);
if (setreuid(0, 0) != 0)
{
perror("setreuid");
Expand Down
40 changes: 37 additions & 3 deletions src/nfsv3mountscript.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ AZNFS_PORT="${AZNFS_PORT:-2048}"
# Default to checking azure nconnect support.
AZNFS_CHECK_AZURE_NCONNECT="${AZNFS_CHECK_AZURE_NCONNECT:-1}"

#
# Default maximum value of nconnect.
# Users can modify the AZNFS_MAX_NCONNECT variable to a lower value.
# This allows mounting more than 20 accounts (with the same endpoint IP)
# from a single VM by restricting the nconnect value to a lower limit.
#
AZNFS_MAX_NCONNECT="${AZNFS_MAX_NCONNECT:-16}"

# Default to fixing mount options passed in to help the user.
AZNFS_FIX_MOUNT_OPTIONS="${AZNFS_FIX_MOUNT_OPTIONS:-1}"

Expand Down Expand Up @@ -124,6 +132,21 @@ check_nconnect()
modprobe sunrpc
fi

# Check if AZNFS_MAX_NCONNECT is defined, numeric, and within the allowed range.
if [[ "$AZNFS_MAX_NCONNECT" =~ ^[0-9]+$ ]]; then

if [[ "$AZNFS_MAX_NCONNECT" -lt 1 || "$AZNFS_MAX_NCONNECT" -gt 16 ]]; then
eecho "[ERROR] Incorrect value $AZNFS_MAX_NCONNECT for the environment variable AZNFS_MAX_NCONNECT. It must be between 1 and 16"
exit 1
fi
else
wecho "AZNFS_MAX_NCONNECT=$AZNFS_MAX_NCONNECT is not defined or invalid. Defaulting to 16."
AZNFS_MAX_NCONNECT=16
fi

# Calculate the maximum accounts mountable from a single tenant.
MAX_ACCOUNTS_MOUNTABLE_FROM_SINGLE_TENANT=$((320 / AZNFS_MAX_NCONNECT))

#
# W/o server side nconnect, we need the azure nconnect support,
# turn it on. OTOH, if Server side nconnect is being used turn off
Expand All @@ -147,6 +170,12 @@ check_nconnect()
vvecho "Azure nconnect not enabled, enabling!"
echo Y > /sys/module/sunrpc/parameters/enable_azure_nconnect
fi

# Check if the current nconnect value in use is suboptimal.
if [[ "$value" -gt "$AZNFS_MAX_NCONNECT" ]]; then
pecho "Suboptimal nconnect value $value, limiting nconnect to the advised value by AZNFS_MAX_NCONNECT: $AZNFS_MAX_NCONNECT."
MOUNT_OPTIONS=$(echo "$MOUNT_OPTIONS" | sed "s/\<nconnect\>=$value/nconnect=$AZNFS_MAX_NCONNECT/g")
fi
else
if has_2048_nconnect_mounts; then
eecho "One or more mounts to port 2048 are using nconnect."
Expand All @@ -166,9 +195,14 @@ check_nconnect()
# Higher nconnect values don't work well for server side
# nconnect, limit to optimal value 4.
#
if [ $value -gt 4 ]; then
pecho "Suboptimal nconnect value $value, forcing nconnect=4!"
MOUNT_OPTIONS=$(echo "$MOUNT_OPTIONS" | sed "s/\<nconnect\>=$value/nconnect=4/g")
OPTIMAL_SERVER_SIDE_NCONNECT=4
if [ -n "$AZNFS_MAX_NCONNECT" ] && [ "$AZNFS_MAX_NCONNECT" -lt "$OPTIMAL_SERVER_SIDE_NCONNECT" ]; then
OPTIMAL_SERVER_SIDE_NCONNECT=$AZNFS_MAX_NCONNECT
fi

if [ "$value" -gt "$OPTIMAL_SERVER_SIDE_NCONNECT" ]; then
pecho "Suboptimal nconnect value $value, forcing nconnect=$OPTIMAL_SERVER_SIDE_NCONNECT!"
MOUNT_OPTIONS=$(echo "$MOUNT_OPTIONS" | sed "s/\<nconnect\>=$value/nconnect=$OPTIMAL_SERVER_SIDE_NCONNECT/g")
fi
fi
fi
Expand Down