From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 1 Apr 2015 13:53:56 +0000 (-0400)
Subject: manually bisecting check for old way of bucket_instance from agent
X-Git-Tag: v1.2.2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6aa07a5d301ecaa2b4f8db4777fd47af239ee78;p=radosgw-agent.git

manually bisecting check for old way of bucket_instance from agent

worker: use current bucket instance, if plain bucket name passed
from: 52c409a782d46ab2f21135de05e2af00656dcf2c
Signed-off-by: Josh Durgin <jdurgin@redhat.com>

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py
index c9df87a..0087da6 100644
--- a/radosgw_agent/worker.py
+++ b/radosgw_agent/worker.py
@@ -376,6 +376,10 @@ 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)
+
             bound = client.get_worker_bound(
                 self.dest_conn,
                 'bucket-index',