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 3b28af5d6e6c7e38e0b6cdefcc0627ca1416aded..a23e657b62c2c2c8b35bc9d4177d0cb226e61f33 100644 (file)
--- 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 7fffdb788e817621ec0ba2e7cb10a0369e2ad032..75bec3850c0974882f266513573a49dcbeaa26df 100644 (file)
--- 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 22dceda29ba215b40f5e6f306b4cbfb2f91a68cf..0a0bb6277a8b94a7c7fb9bcdc90f530b4646128a 100644 (file)
--- 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);