Mailing List Archive

svn commit: r329980 - in /spamassassin/trunk: build/automc/buildbot_ready build/automc/populate_cor build/automc/run_preflight masses/mass-check
Author: jm
Date: Mon Oct 31 21:28:18 2005
New Revision: 329980

URL: http://svn.apache.org/viewcvs?rev=329980&view=rev
Log:
switch preflight buildbot to store corpora on a tmpfs drive, to make up for atrocious I/O speeds on the zone's main /home filesystem

Modified:
spamassassin/trunk/build/automc/buildbot_ready
spamassassin/trunk/build/automc/populate_cor
spamassassin/trunk/build/automc/run_preflight
spamassassin/trunk/masses/mass-check

Modified: spamassassin/trunk/build/automc/buildbot_ready
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/buildbot_ready?rev=329980&r1=329979&r2=329980&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/buildbot_ready (original)
+++ spamassassin/trunk/build/automc/buildbot_ready Mon Oct 31 21:28:18 2005
@@ -36,13 +36,10 @@
# system ("svn info --non-interactive > masses/svninfo.tmp");
system ("svn info > masses/svninfo.tmp < /dev/null");

- if (0) { # Disabled. just too slow right now!
-
if (!perform_singleton_actions()) {
# give the "winning" slave time to do the work we also need done
print "sleeping for 60 seconds so that corpus is rebuilt\n";
sleep 60;
- }
}
}


Modified: spamassassin/trunk/build/automc/populate_cor
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/populate_cor?rev=329980&r1=329979&r2=329980&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/populate_cor (original)
+++ spamassassin/trunk/build/automc/populate_cor Mon Oct 31 21:28:18 2005
@@ -4,21 +4,24 @@

SADIR=/home/automc/svn/spamassassin

+[ -d /home/bbmass/tmpfs/cor ] || \
+ mkdir /home/bbmass/tmpfs/tmp /home/bbmass/tmpfs/cor
+
cd /home/bbmass/rawcor
date

TMPDIR=/home/bbmass/tmp \
$SADIR/masses/corpora/mk-corpus-link-farm \
- -dest /home/bbmass/cor/mc-fast -num 1000 \
- -dest /home/bbmass/cor/mc-med -num 5000 \
- -dest /home/bbmass/cor/mc-slow -num 10000 \
- -dest /home/bbmass/cor/mc-slower \
+ -dest /home/bbmass/tmpfs/cor/mc-fast -num 1000 \
+ -dest /home/bbmass/tmpfs/cor/mc-med -num 5000 \
+ -dest /home/bbmass/tmpfs/cor/mc-slow -num 10000 \
+ -dest /home/bbmass/tmpfs/cor/mc-slower \
*

for dir in mc-fast mc-med mc-slow mc-slower
do
-echo "ham:dir:/home/bbmass/cor/$dir/ham
-spam:dir:/home/bbmass/cor/$dir/spam" > /home/bbmass/cor/$dir/targets
+echo "ham:dir:/home/bbmass/tmpfs/cor/$dir/ham
+spam:dir:/home/bbmass/tmpfs/cor/$dir/spam" > /home/bbmass/tmpfs/cor/$dir/targets
done

date

Modified: spamassassin/trunk/build/automc/run_preflight
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/run_preflight?rev=329980&r1=329979&r2=329980&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/run_preflight (original)
+++ spamassassin/trunk/build/automc/run_preflight Mon Oct 31 21:28:18 2005
@@ -15,7 +15,7 @@
my $pwd = `pwd`;
$pwd =~ /slaves\/([-_A-Za-z0-9]+)\//; if ($1) { $slavename = $1; }

-my $targets = "/cor/$1/targets";
+my $targets = "/tmpfs/cor/$1/targets";
print "[using corpus targets file: $targets]\n";

# super-nice please!

Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/mass-check?rev=329980&r1=329979&r2=329980&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Mon Oct 31 21:28:18 2005
@@ -296,6 +296,8 @@
close(REWRITE);
}

+$spamtest->finish();
+
# exit status: did we check at least one message correctly?
exit(!($ham_count || $spam_count));