From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 28 Jan 2015 23:54:23 +0000 (-0800)
Subject: rgw: fixing rebase casualties
X-Git-Tag: v0.93~165^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4a6eabb452a8f3b8d0d265b9f2b76ef10fc4031;p=ceph.git

rgw: fixing rebase casualties

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

diff --git a/src/rgw/rgw_rest_replica_log.cc b/src/rgw/rgw_rest_replica_log.cc
index ddcf635814de..543974a455c4 100644
--- a/src/rgw/rgw_rest_replica_log.cc
+++ b/src/rgw/rgw_rest_replica_log.cc
@@ -146,7 +146,7 @@ void RGWOp_OBJLog_DeleteBounds::execute() {
   http_ret = rl.delete_bound(shard, daemon_id, purge_all);
 }
 
-static int bucket_instance_to_bucket(RGWRados *store, string& bucket_instance, rgw_bucket& bucket) {
+static int bucket_instance_to_bucket(RGWRados *store, const string& bucket_instance, rgw_bucket& bucket) {
   RGWBucketInfo bucket_info;
   time_t mtime;
   
@@ -162,10 +162,8 @@ static int bucket_instance_to_bucket(RGWRados *store, string& bucket_instance, r
   return 0;
 }
 
-static int get_bucket_for_bounds(RGWRados *store, XMLArgs& args, rgw_bucket& bucket, bool *index_by_instance)
+static int get_bucket_for_bounds(RGWRados *store, XMLArgs& args, const string& bucket_instance, rgw_bucket& bucket, bool *index_by_instance)
 {
-  string bucket_instance = args.get("bucket-instance");
-
   args.get_bool("index-by-instance", index_by_instance, true);
 
   if (*index_by_instance) {
@@ -235,7 +233,7 @@ void RGWOp_BILog_SetBounds::execute() {
   rgw_bucket bucket;
   bool index_by_instance;
 
-  if ((http_ret = get_bucket_for_bounds(store, s->info.args, bucket, &index_by_instance)) < 0) {
+  if ((http_ret = get_bucket_for_bounds(store, s->info.args, bucket_instance, bucket, &index_by_instance)) < 0) {
     return;
   }
   
@@ -256,17 +254,18 @@ void RGWOp_BILog_GetBounds::execute() {
   rgw_bucket bucket;
   bool index_by_instance;
 
-  if ((http_ret = get_bucket_for_bounds(store, s->info.args, bucket, &index_by_instance)) < 0) {
-    return;
-  }
-
   int shard_id;
+
   http_ret = rgw_bucket_parse_bucket_instance(bucket_instance, &bucket_instance, &shard_id);
   if (http_ret < 0) {
     dout(5) << "failed to parse bucket instance" << dendl;
     return;
   }
 
+  if ((http_ret = get_bucket_for_bounds(store, s->info.args, bucket_instance, bucket, &index_by_instance)) < 0) {
+    return;
+  }
+
   if ((http_ret = bucket_instance_to_bucket(store, bucket_instance, bucket)) < 0) 
     return;
 
@@ -309,11 +308,10 @@ void RGWOp_BILog_DeleteBounds::execute() {
   rgw_bucket bucket;
   bool index_by_instance;
 
-  if ((http_ret = get_bucket_for_bounds(store, s->info.args, bucket, &index_by_instance)) < 0) {
+  if ((http_ret = get_bucket_for_bounds(store, s->info.args, bucket_instance, bucket, &index_by_instance)) < 0) {
     return;
   }
 
-
   RGWReplicaBucketLogger rl(store);
   http_ret = rl.delete_bound(bucket, shard_id, daemon_id, index_by_instance, purge_all);
 }