From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 21 Mar 2023 02:39:31 +0000 (-0400)
Subject: rgw/admin: 'buckets list' takes --marker
X-Git-Tag: v19.0.0~427^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b75cc5c10e5ee6f77a3ec2e78365497e9f8025a0;p=ceph.git

rgw/admin: 'buckets list' takes --marker

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_bucket.cc b/src/rgw/driver/rados/rgw_bucket.cc
index 3b28af5d6e6..a23e657b62c 100644
--- a/src/rgw/driver/rados/rgw_bucket.cc
+++ b/src/rgw/driver/rados/rgw_bucket.cc
@@ -1091,7 +1091,7 @@ int RGWBucketAdminOp::info(rgw::sal::Driver* driver,
 
     rgw::sal::BucketList buckets;
     std::unique_ptr<rgw::sal::User> user = driver->get_user(op_state.get_user_id());
-    std::string marker;
+    std::string marker = op_state.marker;
     const std::string empty_end_marker;
     constexpr bool no_need_stats = false; // set need_stats to false
 
diff --git a/src/rgw/driver/rados/rgw_bucket.h b/src/rgw/driver/rados/rgw_bucket.h
index 7fffdb788e8..75bec3850c0 100644
--- a/src/rgw/driver/rados/rgw_bucket.h
+++ b/src/rgw/driver/rados/rgw_bucket.h
@@ -222,6 +222,7 @@ struct RGWBucketAdminOpState {
   std::string bucket_id;
   std::string object_name;
   std::string new_bucket_name;
+  std::string marker;
 
   bool list_buckets;
   bool stat_buckets;
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 22dceda29ba..0a0bb6277a8 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -6982,6 +6982,7 @@ int main(int argc, const char **argv)
           return -ENOENT;
         }
       }
+      bucket_op.marker = marker;
       RGWBucketAdminOp::info(driver, bucket_op, stream_flusher, null_yield, dpp());
     } else {
       int ret = init_bucket(user.get(), tenant, bucket_name, bucket_id, &bucket);