From 2f1c66f8a7b3fcaaff7657eaab69ebba24d4b912 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 8 Nov 2006 00:43:10 +0000 Subject: [PATCH] * No longer pass explicit cache tuning options to afsd and instead let OpenAFS automatically choose tuning based on the cache size. --- debian/afs.conf | 23 +++++------------------ debian/changelog | 4 +++- debian/openafs-client.init | 16 +++------------- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/debian/afs.conf b/debian/afs.conf index 64490a1bd..f3eeb76f3 100644 --- a/debian/afs.conf +++ b/debian/afs.conf @@ -56,25 +56,12 @@ VERBOSE= # Using the memory cache is not recommended. It's less stable than the disk # cache and doesn't improve performance as much as it might sound. # -# The default behavior is to pick one of the following option sets based on -# the size of the AFS cache, as follows: +# The default behavior is to let afsd automatically choose an apporpriate set +# of flags. This should produce reasonable behavior for most working sets +# provided that one is using a modern AFS client (1.4.2 or later). # -# cache < 128MB $SMALL -# 128MB < cache < 512MB $MEDIUM -# 512MB < cache < 1GB $LARGE -# 1GB < cache < 2GB $XLARGE -# 2GB < cache $XXLARGE -# -# You can override that default behavior by setting OPTIONS below. -XXLARGE="-chunksize 20 -files 80000 -dcache 10000 -stat 15000 -daemons 6 -volumes 500" -XLARGE="-chunksize 20 -files 50000 -dcache 10000 -stat 15000 -daemons 5 -volumes 250" -LARGE="-chunksize 18 -files 25000 -dcache 10000 -stat 15000 -daemons 5 -volumes 200" -MEDIUM="-chunksize 18 -files 10000 -dcache 5000 -stat 7500 -daemons 3 -volumes 200" -SMALL="-chunksize 18 -files 2500 -dcache 2000 -stat 3000 -daemons 2 -volumes 200" - -# The default behavior is to pick one of the above settings as described -# above. You can override this by setting OPTIONS explicitly to either one of -# the above variables or to any set of flags that you prefer. +# You can override that default behavior by setting OPTIONS to a specific set +# of flags. OPTIONS=AUTOMATIC # The default value for the client sysname (as returned by fs sysname) is diff --git a/debian/changelog b/debian/changelog index c3fc430b6..0a3fb8126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ openafs (1.4.2-3) unstable; urgency=low + * No longer pass explicit cache tuning options to afsd and instead let + OpenAFS automatically choose tuning based on the cache size. * Change the documentation of afsd -shutdown to be less dire and more accurate. Thanks, Daniel J. Priem. (Closes: #394990) * Document (at least partially) AFS's mapping of Kerberos v5 principal @@ -7,7 +9,7 @@ openafs (1.4.2-3) unstable; urgency=low J. Priem. (Closes: #394832) * Document that aklog -setpag may not always work. - -- Russ Allbery Sun, 5 Nov 2006 20:23:21 -0800 + -- Russ Allbery Tue, 7 Nov 2006 16:41:56 -0800 openafs (1.4.2-2) unstable; urgency=low diff --git a/debian/openafs-client.init b/debian/openafs-client.init index fe6b9ec6e..b75400fa4 100755 --- a/debian/openafs-client.init +++ b/debian/openafs-client.init @@ -109,20 +109,10 @@ EOF # settings that are checked here. choose_afsd_options() { if [ -z "$OPTIONS" ] || [ "$OPTIONS" = "AUTOMATIC" ] ; then - CACHESIZE=`awk -F: '{print $3}' < /etc/openafs/cacheinfo` - if [ $CACHESIZE -lt 131072 ] ; then - OPTIONS=$SMALL - elif [ $CACHESIZE -lt 524288 ] ; then - OPTIONS=$MEDIUM - elif [ $CACHESIZE -lt 1048576 ] ; then - OPTIONS=$LARGE - elif [ $CACHESIZE -lt 2097152 ] ; then - OPTIONS=$XLARGE - else - OPTIONS=$XXLARGE - fi + AFSD_OPTIONS="$VERBOSE" + else + AFSD_OPTIONS="$OPTIONS $VERBOSE" fi - AFSD_OPTIONS="$OPTIONS $VERBOSE" # These variables are from /etc/openafs/afs.conf.client and are managed # automatically by debconf. -- 2.39.5