[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit dc4f435c09f3756a65ec227a00023c6074afa4c1
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 22:27:22 2010 +0000

    2010-03-01  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            EWS can hang for five hours when compile output is too big
            https://bugs.webkit.org/show_bug.cgi?id=35545
    
            * Scripts/webkitpy/commands/queues.py: Limit uploads to 1MB instead of
            5MB.  AppEngine seems to not like 5MB uploads.  I'm not sure what the
            limit is.  Let's try 1MB for a while and see how it goes.
            * Scripts/webkitpy/networktransaction.py: Tune the default parameters
            to our exponential backoff.  I'm not sure why I picked five hours as
            the retry limit.  That seems way too large.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55380 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b8c01f5..88e4212 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-01  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        EWS can hang for five hours when compile output is too big
+        https://bugs.webkit.org/show_bug.cgi?id=35545
+
+        * Scripts/webkitpy/commands/queues.py: Limit uploads to 1MB instead of
+        5MB.  AppEngine seems to not like 5MB uploads.  I'm not sure what the
+        limit is.  Let's try 1MB for a while and see how it goes.
+        * Scripts/webkitpy/networktransaction.py: Tune the default parameters
+        to our exponential backoff.  I'm not sure why I picked five hours as
+        the retry limit.  That seems way too large.
+
 2010-03-01  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/Scripts/webkitpy/commands/queues.py b/WebKitTools/Scripts/webkitpy/commands/queues.py
index fe2bc66..98dc248 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queues.py
@@ -132,7 +132,7 @@ class AbstractQueue(Command, QueueEngineDelegate):
         message = script_error.message
         if is_error:
             message = "Error: %s" % message
-        output = script_error.message_with_output(output_limit=5*1024*1024) # 5MB
+        output = script_error.message_with_output(output_limit=1024*1024) # 1MB
         return tool.status_server.update_status(cls.name, message, state["patch"], StringIO(output))
 
 
diff --git a/WebKitTools/Scripts/webkitpy/networktransaction.py b/WebKitTools/Scripts/webkitpy/networktransaction.py
index 65ea27d..e053bd6 100644
--- a/WebKitTools/Scripts/webkitpy/networktransaction.py
+++ b/WebKitTools/Scripts/webkitpy/networktransaction.py
@@ -37,7 +37,7 @@ class NetworkTimeout(Exception):
 
 
 class NetworkTransaction(object):
-    def __init__(self, initial_backoff_seconds=10, grown_factor=1.1, timeout_seconds=5*60*60):
+    def __init__(self, initial_backoff_seconds=10, grown_factor=1.5, timeout_seconds=10*60):
         self._initial_backoff_seconds = initial_backoff_seconds
         self._grown_factor = grown_factor
         self._timeout_seconds = timeout_seconds

-- 
WebKit Debian packaging