Do not retry uploading to blobstore on HTTP 500, regenerate a new url first.

isolateserver_archive.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Archives a set of files to a server."""
 
 import binascii
 import hashlib
 import logging
@@ skipping 109 matching lines @@
 
   Arguments:
     generate_upload_url: The url to get the new upload url from.
     data: extra POST data.
     hash_key: sha1 of the uncompressed version of content.
     content: The contents to upload. Must fit in memory for now.
   """
   logging.debug('Generating url to directly upload file to blobstore')
   assert isinstance(hash_key, str), hash_key
   assert isinstance(content, str), (hash_key, content)
-  upload_url = url_open(generate_upload_url, data=data).read()
+  # TODO(maruel): Support large files. This would require streaming support.
+  content_type, body = encode_multipart_formdata(
+      data, [('content', hash_key, content)])
+  for _ in range(run_isolated.MAX_URL_OPEN_ATTEMPTS):
+    # Retry HTTP 50x here.
+    response = run_isolated.url_open(generate_upload_url, data=data)
+    if not response:
+      raise run_isolated.MappingError(
+          'Unable to connect to server %s' % generate_upload_url)
+    upload_url = response.read()
 
-  if not upload_url:
-    logging.error('Unable to generate upload url')
-    return
-
-  # TODO(maruel): Support large files.
-  content_type, body = encode_multipart_formdata(
-       data, [('content', hash_key, content)])
-  return url_open(upload_url, data=body, content_type=content_type)
+    # Do not retry this request on HTTP 50x. Regenerate an upload url each time
+    # since uploading "consumes" the upload url.
+    result = run_isolated.url_open(
+        upload_url, data=body, content_type=content_type, retry_50x=False)
+    if result:
+      return result.read()
+  raise run_isolated.MappingError(
+      'Unable to connect to server %s' % generate_upload_url)
 
 
 class UploadRemote(run_isolated.Remote):
   def __init__(self, namespace, base_url, token):
     self.namespace = str(namespace)
     self._token = token
     super(UploadRemote, self).__init__(base_url)
 
   def get_file_handler(self, base_url):
     base_url = str(base_url)
@@ skipping 208 matching lines @@
   with run_isolated.Profiler('Archive'):
     return upload_sha1_tree(
         base_url=options.remote,
         indir=os.getcwd(),
         infiles=infiles,
         namespace=options.namespace)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))