[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-650-g8d79273

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit b768a38e34088e7eadcfded59ec9fa98cf6da313
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 2 20:58:29 2012 +0200

    p-s: randomize waiting if master is busy
    
    Wait randomly between 60 and 180 seconds before contacting
    a busy master again.
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 765d529..fffdeac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,8 @@ piuparts (0.45) UNRELEASED; urgency=low
     - Stop using static known_circular_depends.
     - Compute dependency cycles and test packages on such cycles if all
       non-circular dependencies are satisfied.
+  * piuparts-slave.py:
+    - Randomize waiting time (between 60 and 180 seconds) if master is busy.
   * piuparts-report.py:
     - Exclude obsolete states from generated report.
     - Establish packagesdb working directory in Section.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index ce2f9c2..65d2da8 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -31,6 +31,7 @@ import logging
 from signal import alarm, signal, SIGALRM, SIGKILL
 import subprocess
 import fcntl
+import random
 import ConfigParser
 
 import piupartslib.conf
@@ -346,7 +347,7 @@ class Section:
             raise
         except MasterIsBusy:
             logging.error("master is busy")
-            self._sleep_until = time.time() + 300
+            self._sleep_until = time.time() + random.randrange(60, 180)
             return 0
         except:
             logging.error("connection to master failed")

-- 
piuparts git repository