Merge lp:~julian-edwards/launchpad/reduce-oops-count-on-uploads-bug-673590 into lp:launchpad

[Julian Edwards]

Change the log level of QueueInconsistentStateError during upload processing so that the logger handler for cron scripts doesn't generate OOPSes.

Change the log level of QueueInconsistentStateError during upload so that the logger handler for cron scripts doesn't generate OOPSes.

[Julian Edwards (julian-edwards)]

review: Approve (code)

[Robert Collins (lifeless)]

Postreview ok.

review: Approve

=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2010-11-05 14:17:11 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2010-11-19 12:53:17 +0000
@@ -42,6 +42,7 @@
 from lp.registry.interfaces.sourcepackage import SourcePackageFileType
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 from lp.soyuz.interfaces.archive import MAIN_ARCHIVE_PURPOSES
+from lp.soyuz.interfaces.queue import QueueInconsistentStateError
 
 
 PARTNER_COMPONENT_NAME = 'partner'
@@ -860,16 +861,26 @@
 
         except (SystemExit, KeyboardInterrupt):
             raise
+        except QueueInconsistentStateError, e:
+            # A QueueInconsistentStateError is expected if the rejection
+            # is a routine rejection due to a bad package upload.
+            # Log at info level so LaunchpadCronScript doesn't generate an
+            # OOPS.
+            func = self.logger.info
+            return self._reject_with_logging(e, notify, func)
         except Exception, e:
             # Any exception which occurs while processing an accept will
             # cause a rejection to occur. The exception is logged in the
             # reject message rather than being swallowed up.
-            self.reject("%s" % e)
-            # Let's log tracebacks for uncaught exceptions ...
-            self.logger.error(
-                'Exception while accepting:\n %s' % e, exc_info=True)
-            self.do_reject(notify)
-            return False
+            func = self.logger.error
+            return self._reject_with_logging(e, notify, func)
+
+    def _reject_with_logging(self, error, notify, log_func):
+        """Helper to reject an upload and log it using the logger function."""
+        self.reject("%s" % error)
+        log_func('Exception while accepting:\n %s' % error, exc_info=True)
+        self.do_reject(notify)
+        return False
 
     def do_reject(self, notify=True):
         """Reject the current upload given the reason provided."""

=== modified file 'lib/lp/archiveuploader/tests/nascentupload.txt'
--- lib/lp/archiveuploader/tests/nascentupload.txt	2010-11-06 12:31:55 +0000
+++ lib/lp/archiveuploader/tests/nascentupload.txt	2010-11-19 12:53:17 +0000
@@ -455,7 +455,7 @@
 The upload will be rejected.
 
   >>> success = ed_src_dup.do_accept()
-  ERROR: Exception while accepting:
+  INFO: Exception while accepting:
   The source ed - 0.2-20 is already accepted in ubuntu/hoary and you
   cannot upload the same version within the same distribution. You
   have to modify the source version and re-upload.