From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 23 Jan 2020 22:33:16 +0000 (-0800)
Subject: rgw: trim bilog: send bucket param instead of source-bucket param
X-Git-Tag: v15.1.0~22^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=768dc94f62b6b60c5fe9cab6cf6efe357cc93e51;p=ceph-ci.git

rgw: trim bilog: send bucket param instead of source-bucket param

For backward compatibility, so that older rgws could handle it appropriately.

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

diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc
index 735e652014a..c0e0aa6b86d 100644
--- a/src/rgw/rgw_rest_log.cc
+++ b/src/rgw/rgw_rest_log.cc
@@ -866,7 +866,8 @@ void RGWOp_BILog_Status::execute()
 
   rgw_bucket source_bucket;
 
-  if (source_key.empty()) {
+  if (source_key.empty() ||
+      source_key == key) {
     source_bucket = info.bucket;
   } else {
     http_ret = rgw_bucket_parse_bucket_key(s->cct, source_key, &source_bucket, nullptr);
diff --git a/src/rgw/rgw_trim_bilog.cc b/src/rgw/rgw_trim_bilog.cc
index abfba41331b..8ccc6d54743 100644
--- a/src/rgw/rgw_trim_bilog.cc
+++ b/src/rgw/rgw_trim_bilog.cc
@@ -500,7 +500,8 @@ int BucketTrimInstanceCR::operate()
           { "type", "bucket-index" },
           { "status", nullptr },
           { "options", "merge" },
-          { "source-bucket", bucket_instance.c_str() },
+          { "bucket", bucket_instance.c_str() }, /* equal to source-bucket when `options==merge` and source-bucket
+                                                    param is not provided */
           { "source-zone", zone_id.c_str() },
           { nullptr, nullptr }
         };