From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 10 May 2014 00:03:02 +0000 (-0700)
Subject: client: convert bucket replica log if needed
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=976f1851a9400459825d438b81b652a0fa486262;p=radosgw-agent.git

client: convert bucket replica log if needed

Fixes: #8251
If replica log entries for bucket does not exist, try to access it through
the old interface (not indexed by instance id). If this works then update
the new one (indexed by instance id), and remove the old one.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/radosgw_agent/client.py b/radosgw_agent/client.py
index 2b8f027..1ab6393 100644
--- a/radosgw_agent/client.py
+++ b/radosgw_agent/client.py
@@ -5,6 +5,7 @@ import logging
 import random
 import requests
 import urllib
+import string
 from urlparse import urlparse
 
 from boto.connection import AWSAuthConnection
@@ -299,30 +300,67 @@ def set_worker_bound(connection, type_, marker, timestamp,
         special_first_param='work_bound',
         )
 
-def del_worker_bound(connection, type_, daemon_id, id_):
+def del_worker_bound(connection, type_, daemon_id, id_, index_by_instance = True):
     key = _id_name(type_)
+    p ={
+        'type': type_,
+        key: id_,
+        'daemon_id': daemon_id,
+    }
+    if not index_by_instance:
+        p['index-by-instance'] = 'false'
+
     return request(
         connection, 'delete', 'admin/replica_log',
-        params={
-            'type': type_,
-            key: id_,
-            'daemon_id': daemon_id,
-            },
+        params=p,
         special_first_param='work_bound',
         expect_json=False,
         )
 
 def get_worker_bound(connection, type_, id_):
     key = _id_name(type_)
-    out = request(
-        connection, 'get', 'admin/replica_log',
-        params={
-            'type': type_,
-            key: id_,
-            },
-        special_first_param='bounds',
-        )
-    boto.log.debug('get_worker_bound returned: %r', out)
+    try:
+        out = request(
+            connection, 'get', 'admin/replica_log',
+            params={
+                'type': type_,
+                key: id_,
+                },
+            special_first_param='bounds',
+            )
+        boto.log.debug('get_worker_bound returned: %r', out)
+    except NotFound:
+        if type_ == 'bucket-index':
+            boto.log.debug('get_worker_bound returned NotFound, retrying without bucket instance indexing (old format)')
+            out = request(
+                connection, 'get', 'admin/replica_log',
+                params={
+                    'type': type_,
+                    key: id_,
+                    'index-by-instance': 'false',
+                    },
+                special_first_param='bounds',
+                )
+            boto.log.debug('get_worker_bound returned: %r', out)
+            entities = set()
+            for item in out['markers']:
+                boto.log.debug('converting item: %r', item)
+                set_worker_bound(connection, type_, item['position_marker'], item['position_time'],
+                                 item['entity'], id_, json.dumps(item['items_in_progress']))
+
+            entity_names = [item['entity'] for item in out['markers']]
+            entities = entities.union(entity_names)
+
+            boto.log.debug('entities: %r', entities)
+
+            for e in entities:
+                boto.log.debug('removing entity: %r', e)
+                del_worker_bound(connection, type_, e, id_, index_by_instance = False)
+
+            raise
+
+        else:
+            raise
     retries = set()
     for item in out['markers']:
         names = [retry['name'] for retry in item['items_in_progress']]