Merge lp:~gholt/swift/walt into lp:~david-goetz/swift/walt

[gholt]

walt: Renaming swift-walt to just walt. Update to support direct objects deletes to a container server.

[lp:~gholt/swift/walt]

208. By gholt on 2011-02-02

Fixed setup.py, self help

=== renamed file 'bin/swift-walt' => 'bin/walt'
--- bin/swift-walt	2011-02-01 19:54:23 +0000
+++ bin/walt	2011-02-02 23:32:11 +0000
@@ -60,6 +60,27 @@
     return resp.status
 
 
+def direct_delete_object_c(node, part, account, container, obj, conn_timeout=5,
+                           response_timeout=15):
+    path = '/%s/%s/%s' % (account, container, obj)
+    with Timeout(conn_timeout):
+        conn = http_connect(node['ip'], node['port'], node['device'], part,
+                'DELETE', path,
+                headers={'x-timestamp': normalize_timestamp(time())})
+    with Timeout(response_timeout):
+        resp = conn.getresponse()
+        resp.read()
+    if resp.status < 200 or resp.status >= 300:
+        raise ClientException(
+            'Container server %s:%s direct object DELETE %s gave status %s' %
+            (node['ip'], node['port'],
+             repr('/%s/%s%s' % (node['device'], part, path)), resp.status),
+            http_host=node['ip'], http_port=node['port'],
+            http_device=node['device'], http_status=resp.status,
+            http_reason=resp.reason)
+    return resp.status
+
+
 def do_listings(left, sleep_amount, options, extra, extra2):
     if options.direct:
         while left[0] > 0:
@@ -78,21 +99,54 @@
 
 
 def fill_queue_from_listings(options, queue):
-    conn = Connection(options.auth, options.user, options.key,
-                      preauthurl=options.preauthurl,
-                      preauthtoken=options.preauthtoken, snet=options.snet)
-    for cont_name in container_names(options.num_containers):
-        cont_list = conn.get_container(cont_name)
-        if cont_list and cont_list[1]:
-            for obj_dict in cont_list[1]:
-                if (cont_name, obj_dict['name']) not in queue['used']:
-                    queue['ok'].add((cont_name, obj_dict['name']))
-            break
+    if options.direct:
+        for cont_name in container_names(options.num_containers):
+            _junk, cont_list = retry(direct_get_container, options.node,
+                options.part, options.account, options.container)
+            if cont_list and cont_list[1]:
+                for obj_dict in cont_list[1]:
+                    if (cont_name, obj_dict['name']) not in queue['used']:
+                        queue['ok'].add((cont_name, obj_dict['name']))
+                break
+    else:
+        conn = Connection(options.auth, options.user, options.key,
+                          preauthurl=options.preauthurl,
+                          preauthtoken=options.preauthtoken, snet=options.snet)
+        for cont_name in container_names(options.num_containers):
+            cont_list = conn.get_container(cont_name)
+            if cont_list and cont_list[1]:
+                for obj_dict in cont_list[1]:
+                    if (cont_name, obj_dict['name']) not in queue['used']:
+                        queue['ok'].add((cont_name, obj_dict['name']))
+                break
 
 
 def do_object_deletes(left, sleep_amount, options, queue, sema):
     if options.direct:
-        raise Exception("Not Implemented")
+        num_sleeps = 0
+        tried_listing = False
+        while left[0] > 0:
+            try:
+                with sema:
+                    cont_name, obj_name = queue['ok'].pop()
+                    queue['used'].add((cont_name, obj_name))
+            except KeyError:
+                if num_sleeps > 1:
+                    if not tried_listing:
+                        with sema:
+                            fill_queue_from_listings(options, queue)
+                        tried_listing = True
+                        continue
+                    left[0] = 0
+                    print "Nothing more to delete!!"
+                    break
+                num_sleeps += 1
+                sleep(1)
+                continue
+            retry(direct_delete_object_c, options.node, options.part,
+                  options.account, cont_name, obj_name)
+            left[0] -= 1
+            sleep(sleep_amount)
     else:
         conn = Connection(options.auth, options.user, options.key,
                           preauthurl=options.preauthurl,
@@ -245,7 +299,7 @@
     1  Does listing requests on the container named walt
     2  Does zero byte object puts into the container named walt
     3  Does head requests on the container named walt
-    4  Does object deletes (only for non direct server tests
+    4  Does object deletes
 
 If -C (multiple containers) is set then instead of hitting walt it will use a
 randomly chosen container

=== modified file 'setup.py'
--- setup.py	2011-02-01 19:54:23 +0000
+++ setup.py	2011-02-02 23:32:11 +0000
@@ -101,7 +101,7 @@
         'bin/swauth-cleanup-tokens', 'bin/swauth-delete-account',
         'bin/swauth-delete-user', 'bin/swauth-list', 'bin/swauth-prep',
         'bin/swauth-set-account-service', 'bin/swift-auth-to-swauth',
-        'bin/swift-walt',
+        'bin/walt',
         ],
     entry_points={
         'paste.app_factory': [

=== modified file 'swift/common/direct_client.py'
--- swift/common/direct_client.py	2011-01-04 23:34:43 +0000
+++ swift/common/direct_client.py	2011-02-02 23:32:11 +0000
@@ -330,7 +330,7 @@
     :param kwargs: keyward arguments to send to func (if retries or
                    error_log are sent, they will be deleted from kwargs
                    before sending on to func)
-    :returns: restult of func
+    :returns: A tuple of (attempts, result of func)
     """
     retries = 5
     if 'retries' in kwargs: