From 768dc94f62b6b60c5fe9cab6cf6efe357cc93e51 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 23 Jan 2020 14:33:16 -0800 Subject: [PATCH] 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 --- src/rgw/rgw_rest_log.cc | 3 ++- src/rgw/rgw_trim_bilog.cc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc index 735e652014a0c..c0e0aa6b86d0c 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 abfba41331b06..8ccc6d5474387 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 } }; -- 2.39.5