From 3ea5a3519f86acde9109bf2ab9b824eb85112d00 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Wed, 21 May 2008 14:52:11 +0000 Subject: [PATCH] DEVEL15-macos-tuning-20080521 LICENSE IPL10 be more aggressive to get better performance (cherry picked from commit 30f65085f7a53ae073e2c4649a462a3a555ebb61) --- src/afsd/afs.rc.darwin | 4 ++++ src/packaging/MacOS/OpenAFS.Info.plist.in | 2 +- src/packaging/MacOS/OpenAFS.info.in | 2 +- src/packaging/MacOS/OpenAFS.post_install | 4 ++++ src/packaging/MacOS/OpenAFS.pre_upgrade | 3 +++ src/packaging/MacOS/afs.conf | 5 ++++- src/packaging/MacOS/buildpkg.sh.in | 10 +--------- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/afsd/afs.rc.darwin b/src/afsd/afs.rc.darwin index 4e3fce37f..40cb0ab88 100644 --- a/src/afsd/afs.rc.darwin +++ b/src/afsd/afs.rc.darwin @@ -140,6 +140,10 @@ StartService() fs sysname $AFS_SYSNAME fi + if [ -n "$AFS_PRECACHE" ] ; then + fs precache $AFS_PRECACHE + fi + # # Run package to update the disk # diff --git a/src/packaging/MacOS/OpenAFS.Info.plist.in b/src/packaging/MacOS/OpenAFS.Info.plist.in index 2a7867212..bf9751531 100644 --- a/src/packaging/MacOS/OpenAFS.Info.plist.in +++ b/src/packaging/MacOS/OpenAFS.Info.plist.in @@ -31,7 +31,7 @@ IFPkgFlagRelocatable IFPkgFlagRestartAction - RecommendedRestart + NoRestart IFPkgFlagRootVolumeOnly IFPkgFlagUpdateInstalledLanguages diff --git a/src/packaging/MacOS/OpenAFS.info.in b/src/packaging/MacOS/OpenAFS.info.in index a026c9844..2977252e1 100644 --- a/src/packaging/MacOS/OpenAFS.info.in +++ b/src/packaging/MacOS/OpenAFS.info.in @@ -11,6 +11,6 @@ Application NO Relocatable NO Required NO InstallOnly NO -RequiresReboot YES +RequiresReboot NO InstallFat NO rootVolumeOnly YES diff --git a/src/packaging/MacOS/OpenAFS.post_install b/src/packaging/MacOS/OpenAFS.post_install index 6961950b0..182b393e8 100644 --- a/src/packaging/MacOS/OpenAFS.post_install +++ b/src/packaging/MacOS/OpenAFS.post_install @@ -108,3 +108,7 @@ elif [ -e config/afssettings ]; then # turn off execution of afssettings chmod a-x config/afssettings fi + +#here we should run tools which configure the client, and then if it's enabled: +/Library/StartupItems/OpenAFS/OpenAFS start + diff --git a/src/packaging/MacOS/OpenAFS.pre_upgrade b/src/packaging/MacOS/OpenAFS.pre_upgrade index ae71e03a5..9b1f721fb 100644 --- a/src/packaging/MacOS/OpenAFS.pre_upgrade +++ b/src/packaging/MacOS/OpenAFS.pre_upgrade @@ -23,3 +23,6 @@ if [ -f config/afsd.options -a -f config/afsd.options.sample ]; then fi fi +if [ -f /Library/StartupItems/OpenAFS/OpenAFS ]; then + /Library/StartupItems/OpenAFS/OpenAFS stop +fi diff --git a/src/packaging/MacOS/afs.conf b/src/packaging/MacOS/afs.conf index 10ae07cc8..7df9e97c7 100644 --- a/src/packaging/MacOS/afs.conf +++ b/src/packaging/MacOS/afs.conf @@ -54,7 +54,7 @@ VERBOSE= # # You can override that default behavior by setting OPTIONS to a specific set # of flags. -OPTIONS="-afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all" +OPTIONS="-chunksize 18 -afsdb -stat 5000 -dcache 800 -daemons 8 -volumes 70 -dynroot -fakestat-all" # The default value for the client sysname (as returned by fs sysname) is # determined during the kernel module build and is taken from the architecture @@ -77,6 +77,9 @@ AFS_SYSNAME="" # fs setserverprefs #} +# Amount to read ahead, or comment out to disable +AFS_PRECACHE=5000 + # If you want to always run some command after starting OpenAFS, you can put # it here. Note that you cannot run multiple commands, even combined with && # or ; or similar shell meta-characters. If you want to run multiple diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in index d70c8fd38..e75ccb664 100644 --- a/src/packaging/MacOS/buildpkg.sh.in +++ b/src/packaging/MacOS/buildpkg.sh.in @@ -125,7 +125,7 @@ if [ $firstpass = yes ]; then cp $CURDIR/CellServDB $PKGROOT/private/var/db/openafs/etc/CellServDB.master echo grand.central.org > $PKGROOT/private/var/db/openafs/etc/ThisCell.sample if [ $majorvers -ge 7 ]; then - echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample + echo /afs:/var/db/openafs/cache:100000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample cp -RP $PKGROOT/Library/OpenAFS/Tools/etc/afssettings $PKGROOT/private/var/db/openafs/etc/config cp settings.plist $PKGROOT/private/var/db/openafs/etc/config/settings.plist.orig else @@ -210,14 +210,6 @@ if [ $secondpass = yes ]; then cp CellServDB.list $PKGRES chown -R root${SEP}wheel $PKGRES rm -rf $CURDIR/OpenAFS.pkg - - # once we have cm cleanup in 10.4 this can go - if [ $majorvers -le 8 ]; then - cat $RESSRC/OpenAFS.info|sed 's/RequiresReboot NO/RequiresReboot YES/'>$RESSRC/OpenAFS.info.new - rm -f $RESSRC/OpenAFS.info - mv $RESSRC/OpenAFS.info.new $RESSRC/OpenAFS.info - fi - if [ $majorvers -ge 7 ]; then echo $package -build -p $CURDIR/OpenAFS.pkg -f $PKGROOT -r $PKGRES \ -i OpenAFS.Info.plist -d OpenAFS.Description.plist -- 2.39.5