Changeset 70092 in webkit

Timestamp:

Oct 19, 2010 3:06:52 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-10-19 Eric Seidel <​eric@webkit.org>

Unreviewed. Will get Adam's commentary after his meeting
for now this gets the commit-cluster back running.

commit-queue gets stuck when release-patch returns 404
​https://bugs.webkit.org/show_bug.cgi?id=47935

I taught NetworkTransaction the basics of 404 handling.
We'll want to go back and teach it how to handle urllib2 404's too
and then deploy it to the places that want it.

• QueueStatusServer/handlers/releasepatch.py:
• Scripts/webkitpy/common/net/buildbot.py:
• Scripts/webkitpy/common/net/networktransaction.py:
• Scripts/webkitpy/common/net/statusserver.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QueueStatusServer/handlers/releasepatch.py (modified) (2 diffs)
• Scripts/webkitpy/common/net/buildbot.py (modified) (2 diffs)
• Scripts/webkitpy/common/net/networktransaction.py (modified) (3 diffs)
• Scripts/webkitpy/common/net/statusserver.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-19  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed.  Will get Adam's commentary after his meeting
+        for now this gets the commit-cluster back running.
+
+        commit-queue gets stuck when release-patch returns 404
+        https://bugs.webkit.org/show_bug.cgi?id=47935
+
+        I taught NetworkTransaction the basics of 404 handling.
+        We'll want to go back and teach it how to handle urllib2 404's too
+        and then deploy it to the places that want it.
+
+        * QueueStatusServer/handlers/releasepatch.py:
+        * Scripts/webkitpy/common/net/buildbot.py:
+        * Scripts/webkitpy/common/net/networktransaction.py:
+        * Scripts/webkitpy/common/net/statusserver.py:
+
 2010-10-19  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/QueueStatusServer/handlers/releasepatch.py

@@ -50 +50 @@
         attachment = Attachment(attachment_id)
         last_status = attachment.status_for_queue(queue)
-        if not last_status:
-            self.error(404)
-            return
 
         # Ideally we should use a transaction for the calls to
@@ -58 +55 @@
 
         # Only remove it from the queue if the last message is not a retry request.
-        if not last_status.is_retry_request():
+        # Allow removing it from the queue even if there is no last_status for easier testing.
+        if not last_status or not last_status.is_retry_request():
             queue.work_items().remove_work_item(attachment_id)
 

trunk/WebKitTools/Scripts/webkitpy/common/net/buildbot.py

@@ -109 +109 @@
     def _fetch_revision_to_build_map(self):
         # All _fetch requests go through _buildbot for easier mocking
+        # FIXME: This should use NetworkTransaction's 404 handling instead.
         try:
             # FIXME: This method is horribly slow due to the huge network load.
@@ -218 +219 @@
     def _fetch_results_html(self):
         results_html = "%s/results.html" % (self.results_url())
-        # FIXME: We need to move this sort of 404 logic into NetworkTransaction or similar.
+        # FIXME: This should use NetworkTransaction's 404 handling instead.
         try:
             return urllib2.urlopen(results_html)

trunk/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py

@@ -30 +30 @@
 import time
 
-from webkitpy.thirdparty.autoinstalled.mechanize import HTTPError
+from webkitpy.thirdparty.autoinstalled import mechanize
 from webkitpy.common.system.deprecated_logging import log
 
@@ -42 +42 @@
 
 class NetworkTransaction(object):
-    def __init__(self, initial_backoff_seconds=10, grown_factor=1.5, timeout_seconds=10*60):
+    def __init__(self, initial_backoff_seconds=10, grown_factor=1.5, timeout_seconds=(10 * 60), convert_404_to_None=False):
         self._initial_backoff_seconds = initial_backoff_seconds
         self._grown_factor = grown_factor
@@ -53 +53 @@
             try:
                 return request()
-            except HTTPError, e:
+            # FIXME: We should catch urllib2.HTTPError here too.
+            except mechanize.HTTPError, e:
+                if convert_404_to_None and e.code == 404:
+                    return None
                 self._check_for_timeout()
                 _log.warn("Received HTTP status %s from server.  Retrying in "

trunk/WebKitTools/Scripts/webkitpy/common/net/statusserver.py

@@ -118 +118 @@
     def release_work_item(self, queue_name, patch):
         _log.debug("Releasing work item %s from %s" % (patch.id(), queue_name))
-        return NetworkTransaction().run(lambda: self._post_release_work_item(queue_name, patch))
+        return NetworkTransaction(convert_404_to_None=True).run(lambda: self._post_release_work_item(queue_name, patch))
 
     def update_work_items(self, queue_name, work_items):
@@ -133 +133 @@
 
     def _fetch_url(self, url):
+        # FIXME: This should use NetworkTransaction's 404 handling instead.
         try:
             return urllib2.urlopen(url).read()