From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 2 Mar 2015 22:56:53 +0000 (-0800)
Subject: worker: use current bucket instance, if plain bucket name passed
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fwip-bucket-instance;p=radosgw-agent.git

worker: use current bucket instance, if plain bucket name passed

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py
index 2b714c0..224bbe4 100644
--- a/radosgw_agent/worker.py
+++ b/radosgw_agent/worker.py
@@ -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,