Merge lp:~greglange/swift/lp725219 into lp:~hudson-openstack/swift/trunk

[Greg Lange]

Fixes problem with creating a new processed files list in log processing when the download of that file fails.

=== modified file 'swift/stats/log_processor.py'
--- swift/stats/log_processor.py	2011-02-25 21:54:59 +0000
+++ swift/stats/log_processor.py	2011-02-25 21:54:59 +0000
@@ -32,7 +32,8 @@
 
 
 class BadFileDownload(Exception):
-    pass
+    def __init__(self, status_code=None):
+        self.status_code = status_code
 
 
 class LogProcessor(object):
@@ -162,7 +163,7 @@
         code, o = self.internal_proxy.get_object(swift_account, container_name,
                                                  object_name)
         if code < 200 or code >= 300:
-            raise BadFileDownload()
+            raise BadFileDownload(code)
         last_part = ''
         last_compressed_part = ''
         # magic in the following zlib.decompressobj argument is courtesy of
@@ -272,8 +273,13 @@
                 already_processed_files = cPickle.loads(buf)
             else:
                 already_processed_files = set()
-        except BadFileDownload:
-            already_processed_files = set()
+        except BadFileDownload, err:
+            if err.status_code == 404:
+                already_processed_files = set()
+            else:
+                self.logger.error(_('Log processing unable to load list of '
+                    'already processed log files'))
+                return
         self.logger.debug(_('found %d processed files') % \
                           len(already_processed_files))
         logs_to_process = self.log_processor.get_data_list(lookback_start,