svn commit: r329736 - in /spamassassin/trunk: MANIFEST.SKIP build/automc/buildbot_ready build/automc/populate_cor

[jm...@apache.org]

Author: jm
Date: Sun Oct 30 20:39:55 2005
New Revision: 329736

URL: http://svn.apache.org/viewcvs?rev=329736&view=rev
Log:
a little less competition for the 'winning' buildbot

Modified:
    spamassassin/trunk/MANIFEST.SKIP
    spamassassin/trunk/build/automc/buildbot_ready
    spamassassin/trunk/build/automc/populate_cor

Modified: spamassassin/trunk/MANIFEST.SKIP
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/MANIFEST.SKIP?rev=329736&r1=329735&r2=329736&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST.SKIP (original)
+++ spamassassin/trunk/MANIFEST.SKIP Sun Oct 30 20:39:55 2005
@@ -114,6 +114,6 @@
 ^rules/70_sandbox.cf$
 ^build/automc/buildbot_ready$
 ^build/automc/mc_completed$
-^build/automc/run_preflight$
 ^build/automc/populate_cor$
+^build/automc/run_preflight$
 ^rulesrc/.*$

Modified: spamassassin/trunk/build/automc/buildbot_ready
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/buildbot_ready?rev=329736&r1=329735&r2=329736&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/buildbot_ready (original)
+++ spamassassin/trunk/build/automc/buildbot_ready Sun Oct 30 20:39:55 2005
@@ -36,14 +36,16 @@
   # system ("svn info --non-interactive > masses/svninfo.tmp");
   system ("svn info > masses/svninfo.tmp < /dev/null");
 
-  perform_singleton_actions();
+  # sleep 10 -- give the "winning" slave time to get started on the
+  # work we also need done
+  perform_singleton_actions() or sleep 10;
 }
 
 sub perform_singleton_actions {
   if (!try_get_exclusive_lock()) {
     print "cannot get the exclusive lock; some other BB slave is\n".    
         "doing the singleton actions for us.\n";
-    return;
+    return 0;
   }
 
   $SIG{INT} = $SIG{TERM} = sub {
@@ -61,6 +63,7 @@
 
   kill_lock();
   $SIG{INT} = $SIG{TERM} = undef;
+  return 1;
 }
 
 sub _perform_singleton_actions_unlocked

Modified: spamassassin/trunk/build/automc/populate_cor
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/automc/populate_cor?rev=329736&r1=329735&r2=329736&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/populate_cor (original)
+++ spamassassin/trunk/build/automc/populate_cor Sun Oct 30 20:39:55 2005
@@ -6,7 +6,6 @@
 
 cd /home/bbmass/rawcor
 date
-renice +20 $$
 
 TMPDIR=/home/bbmass/tmp \
   $SADIR/masses/corpora/mk-corpus-link-farm \