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

[Greg Lange]

swauth-cleanup-tokens now handles 404s on token containers and tokens better

[gholt (gholt)]

*Do not approve until after Cactus release*

=== modified file 'bin/swauth-cleanup-tokens'
--- bin/swauth-cleanup-tokens	2011-03-24 22:51:44 +0000
+++ bin/swauth-cleanup-tokens	2011-04-12 19:22:26 +0000
@@ -25,7 +25,7 @@
 from sys import argv, exit
 from time import sleep, time
 
-from swift.common.client import Connection
+from swift.common.client import Connection, ClientException
 
 
 if __name__ == '__main__':
@@ -65,7 +65,17 @@
         while True:
             if options.verbose:
                 print 'GET %s?marker=%s' % (container, marker)
-            objs = conn.get_container(container, marker=marker)[1]
+            try:
+                objs = conn.get_container(container, marker=marker)[1]
+            except ClientException, e:
+                if e.http_status == 404:
+                    print 'Container %s not found' % (container)
+                    print 'swauth-prep needs to be rerun'
+                    exit()
+                else:
+                    print 'Object listing on container %s failed with ' \
+                        'status code %d' % (container, e.http_status)
+                    break
             if objs:
                 marker = objs[-1]['name']
             else:
@@ -90,7 +100,13 @@
                                   (container, obj['name'],
                                    time() - detail['expires'])
                         print 'DELETE %s/%s' % (container, obj['name'])
-                        conn.delete_object(container, obj['name'])
+                        try:
+                            conn.delete_object(container, obj['name'])
+                        except ClientException, e:
+                            if e.http_status != 404:
+                                print 'DELETE of %s/%s failed with status ' \
+                                    'code %d' % (container, obj['name'],
+                                    e.http_status)
                     elif options.verbose:
                         print "%s/%s won't expire for %ds; skipping" % \
                               (container, obj['name'],