svn commit: r501535 - in /spamassassin/trunk/build/automc: etc-init.d-bbmass run_nightly run_preflight

[jm...@apache.org]

Author: jm
Date: Tue Jan 30 12:15:46 2007
New Revision: 501535

URL: http://svn.apache.org/viewvc?view=rev&rev=501535
Log:
reinstate wide use of /tmpfs, a memory-backed filesystem, to store the mass-check cache data.  This should help reduce I/O load on the zone

Modified:
    spamassassin/trunk/build/automc/etc-init.d-bbmass
    spamassassin/trunk/build/automc/run_nightly
    spamassassin/trunk/build/automc/run_preflight

Modified: spamassassin/trunk/build/automc/etc-init.d-bbmass
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/etc-init.d-bbmass?view=diff&rev=501535&r1=501534&r2=501535
==============================================================================
--- spamassassin/trunk/build/automc/etc-init.d-bbmass (original)
+++ spamassassin/trunk/build/automc/etc-init.d-bbmass Tue Jan 30 12:15:46 2007
@@ -5,12 +5,6 @@
 # PASSWORD=[whatever]
 # buildbot slave /export/home/buildbot/slaves/slave-name buildbot.spamassassin.org:9989 slave-name $PASSWORD
 
-# to use a real tmpfs, add this to /etc/vfstab:
-#
-# swap            -               /export/home/bbmass/tmpfs       tmpfs - no      -
-#
-# this is now off; the disk I/O speeds have improved, it's no longer necessary.
-
 . /etc/profile
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/bin:/usr/sfw/bin:/opt/sfw/bin:/opt/SUNWspro/bin:/opt/subversion-1.1.4/bin:/usr/apache2/bin:/local/bin
@@ -29,11 +23,13 @@
 }
 
 start() {
-    # echo "Mounting tmpfs: "
-    # mount /export/home/bbmass/tmpfs
-    # echo "Done."
-
+    echo "Mounting tmpfs: "
+    [ -d /export/home/bbmass/tmpfs ] || mkdir -p /export/home/bbmass/tmpfs
+    mount -F tmpfs swap /export/home/bbmass/tmpfs
+    rm -f /tmpfs
+    ln -s /export/home/bbmass/tmpfs /tmpfs
     chmod 1777 /export/home/bbmass/tmpfs
+    echo "Done."
 
     echo "Starting $prog: " 
     runall start
@@ -47,7 +43,8 @@
     RETVAL=$?
     return $RETVAL
 
-    # umount /export/home/bbmass/tmpfs
+    umount /export/home/bbmass/tmpfs
+    chmod 0 /export/home/bbmass/tmpfs
 }
 
 case "$1" in

Modified: spamassassin/trunk/build/automc/run_nightly
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/run_nightly?view=diff&rev=501535&r1=501534&r2=501535
==============================================================================
--- spamassassin/trunk/build/automc/run_nightly (original)
+++ spamassassin/trunk/build/automc/run_nightly Tue Jan 30 12:15:46 2007
@@ -41,6 +41,9 @@
 
   echo "Starting corpus-nightly for $user ($dir)"
 
+  [ -d /tmpfs/aicache ] || mkdir /tmpfs/aicache
+  chmod 1777 /tmpfs/aicache
+
   (
     HOME=$dir
 

Modified: spamassassin/trunk/build/automc/run_preflight
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/run_preflight?view=diff&rev=501535&r1=501534&r2=501535
==============================================================================
--- spamassassin/trunk/build/automc/run_preflight (original)
+++ spamassassin/trunk/build/automc/run_preflight Tue Jan 30 12:15:46 2007
@@ -45,6 +45,9 @@
 system ("rm -rf tstrules");
 run "mkdir tstrules";
 
+system ("mkdir /tmpfs/aicache");
+system ("chmod 1777 /tmpfs/aicache");
+
 run "cp ../rules/*.* tstrules";
 run "cp plugins/*.* tstrules";