]> git-server-git.apps.pok.os.sepia.ceph.com Git - radosgw-agent.git/commitdiff
worker: use current bucket instance, if plain bucket name passed wip-bucket-instance
authorJosh Durgin <jdurgin@redhat.com>
Mon, 2 Mar 2015 22:56:53 +0000 (14:56 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 2 Mar 2015 22:56:53 +0000 (14:56 -0800)
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
radosgw_agent/worker.py

index 2b714c044f03aeabcae657f92f46c4e854771c36..224bbe430e40307f3ac0ccd07cc87449d447af2e 100644 (file)
@@ -323,6 +323,9 @@ class DataWorkerIncremental(IncrementalMixin, DataWorker):
 
         new_retries = []
         for bucket_instance in bucket_instances.union(retries):
+            if ':' not in bucket_instance:
+                # it's just a plain bucket from an old version of the agent
+                bucket_instance = self.get_bucket_instance(bucket_instance)
             try:
                 marker, timestamp, retries = client.get_worker_bound(
                     self.dest_conn,