svn commit: r579357 - in /spamassassin/trunk/masses: mass-check rule-qa/corpus-nightly rule-qa/nightly-slaves-start

[jm...@apache.org]

Author: jm
Date: Tue Sep 25 12:36:50 2007
New Revision: 579357

URL: http://svn.apache.org/viewvc?rev=579357&view=rev
Log:
use --run_post_scan to start the mass-check slaves. this fixes two bugs, namely: (1) sometimes the scan stage takes 3 hours, which was simply too long for mass-check --client to sanely sleep for; (2) some mass-check corpora don't contain any messages up to date, so the scan stage would exit with 'no messages to process' -- but the clients were already running and would stay running, idle, for 6 hours.  using --run_post_scan to start the slaves works around both problems.  Also, reduce the conn_retries timeout back down to a sane hour, now that we don't have to wait for it necessarily

Added:
    spamassassin/trunk/masses/rule-qa/nightly-slaves-start   (with props)
Modified:
    spamassassin/trunk/masses/mass-check
    spamassassin/trunk/masses/rule-qa/corpus-nightly

Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?rev=579357&r1=579356&r2=579357&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Tue Sep 25 12:36:50 2007
@@ -1722,10 +1722,7 @@
   }
 
   my $made_conn_once = 0;
-
-  # 6 hours; it can take the SpamAssassin zone this long to perform the
-  # scan stage if the ArchiveIterator cache is cold
-  my $conn_retries = 60 * 6;
+  my $conn_retries = 60;            # 1 hour
 
   # keep going until something stops us.
   while (1) {

Modified: spamassassin/trunk/masses/rule-qa/corpus-nightly
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/corpus-nightly?rev=579357&r1=579356&r2=579357&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/corpus-nightly (original)
+++ spamassassin/trunk/masses/rule-qa/corpus-nightly Tue Sep 25 12:36:50 2007
@@ -146,13 +146,14 @@
   # the master server and "steal" scanned mails
   cp /local/bbmasstools/mass-check-certs/*.pem spamassassin/
 
-  for host in $clienthosts ; do
-    rule-qa/nightly-slave-start $host
-  done
+  $PERL mass-check --noisy --progress --cs_ssl --server $serverhost \
+    --run_post_scan="./rule-qa/nightly-slaves-start $clienthosts" \
+    $opts
 
-  $PERL mass-check --noisy --progress --cs_ssl --server $serverhost $opts
-
-  # the slaves will exit when the server mass-check does
+  # the slaves will be started if the "run" stage is started, and
+  # will exit when the server mass-check does (they "phone home"
+  # to the specified server host/port and exit if that disappears
+  # for a long time)
 fi
 
 date | tee test.end

Added: spamassassin/trunk/masses/rule-qa/nightly-slaves-start
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/nightly-slaves-start?rev=579357&view=auto
==============================================================================
--- spamassassin/trunk/masses/rule-qa/nightly-slaves-start (added)
+++ spamassassin/trunk/masses/rule-qa/nightly-slaves-start Tue Sep 25 12:36:50 2007
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for host in $* ; do
+  rule-qa/nightly-slave-start $host
+done
+

Propchange: spamassassin/trunk/masses/rule-qa/nightly-slaves-start
------------------------------------------------------------------------------
    svn:executable = *