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 c9df87af16017318c4941d6ab06deb9ddf8f344e..0087da6c286335d42fb2a11d52664a36e8b138bd 100644 (file)
--- 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',