Reduce spam from CQ.

pending_manager.py

Index: pending_manager.py
diff --git a/pending_manager.py b/pending_manager.py
index 6f61d4b8641745cd1b41dce570bed1dcc5824ba9..4ba87b5b5e858b0419a420b13bff087f1ebac704 100644
--- a/pending_manager.py
+++ b/pending_manager.py
@@ -544,18 +544,11 @@ class PendingManager(object):
           self.context.rietveld.close_issue(pending.issue)
           self.context.rietveld.update_description(
               pending.issue, issue_desc.description)
-          self.context.rietveld.add_comment(
-              pending.issue, 'Change committed as %s' % pending.revision)
+          self._discard_pending(pending,

[Paweł Hajdan Jr., 2014/02/03 18:47:34]

I think this discard_pending call should be outside this try-except.

Even if AE (AppEngine) is flaky, CQ should still discard the issue.

[iannucci, 2014/02/03 19:21:32]

Yes, but then the Issue won't have the final committed message. They should both
be done together in a transaction.

[Sergey Berezin, 2014/02/03 19:48:43]

Actually, moving _discard_pending() after try...except makes it a higher chance
that the message will be posted regardless of the status update, which I prefer
to a silent commit.

Personally, I'd even move _discard_pending() right after checkout.commit() call
above, but we like it to appear in a special color.

+                                'Change committed as %s' % pending.revision)
         except (urllib2.HTTPError, urllib2.URLError) as e:
           # Ignore AppEngine flakiness.
           logging.warning('Unable to fully close the issue')
-        # And finally remove the issue. If the close_issue() call above failed,
-        # it is possible the dashboard will be confused but it is harmless.
-        try:
-          self.queue.get(pending.issue)
-        except KeyError:
-          logging.error('Internal inconsistency for %d', pending.issue)
-        self.queue.remove(pending.issue)
       except (
           checkout.PatchApplicationFailed, patch.UnsupportedPatchFormat) as e:
         raise base.DiscardPending(pending, str(e))