Handle the PrimeLint SSL read timeout better.

gcl.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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
 import json
 import optparse
 import os
 import random
 import re
+import ssl
 import string
 import sys
 import tempfile
 import time
 import urllib2
 
 import breakpad  # pylint: disable=W0611
 
 
 import fix_encoding
@@ skipping 367 matching lines @@
 
   def AddComment(self, comment):
     """Adds a comment for an issue on Rietveld.
     As a side effect, this will email everyone associated with the issue."""
     return self.RpcServer().add_comment(self.issue, comment)
 
   def PrimeLint(self):
     """Do background work on Rietveld to lint the file so that the results are
     ready when the issue is viewed."""
     if self.issue and self.patchset:
-      self.SendToRietveld('/lint/issue%s_%s' % (self.issue, self.patchset),
-          timeout=10)
+      try:

[M-A Ruel, 2014/01/09 02:08:14]

You could remove the call completely.

[wtc, 2014/01/09 15:07:34]

Does "git cl upload" also run lint job on Rietveld? If not, I guess gcl.py
doesn't need to do this.

Do you know if '/lint/issue%s_%s' really lints the files in the background, as
the comment on line 401 and the function name "PrimeLint" imply? The root cause
of this bug may be that '/lint/issue%s_%s' is waiting for the completion of
lint.

[wtc, 2014/01/09 17:58:27]

Thanks for the reply.

I suspect the "background work" and the "PrimeLint" function name are referring
to the fact that we invoke '/lint/issue%s_%s' with a short timeout. The timeout
needs to be long enough to ensure the lint job gets started, but we are not
interested in waiting for the completion of lint.

So I've changed the timeout back to 10 seconds, and just silently ignore the
expected timeout error.

+        print "Linting the CL on Rietveld..."
+        self.SendToRietveld('/lint/issue%s_%s' % (self.issue, self.patchset),
+            timeout=60)
+        print "Lint done"
+      except ssl.SSLError as e:
+        if e.message == 'The read operation timed out':
+          print "Rietveld took too long to lint the CL. Read timeout ignored."
+        else:
+          raise
 
   def SendToRietveld(self, request_path, timeout=None, **kwargs):
     """Send a POST/GET to Rietveld.  Returns the response body."""
     try:
       return self.RpcServer().Send(request_path, timeout=timeout, **kwargs)
     except urllib2.URLError:
       if timeout is None:
         ErrorExit('Error accessing url %s' % request_path)
       else:
         return None
@@ skipping 1062 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))