From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Thu, 5 Aug 2021 19:21:22 +0000 (-0400)
Subject: Merge pull request #42125 from ivancich/wip-cls-empty-listing
X-Git-Tag: v17.1.0~1193
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e2a9a741bc2488b5390ba26f2e90098888ec2295;p=ceph.git

Merge pull request #42125 from ivancich/wip-cls-empty-listing

rgw: resolve empty ordered bucket listing results w/ CLS filtering

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

e2a9a741bc2488b5390ba26f2e90098888ec2295
diff --cc src/cls/rgw/cls_rgw_types.h
index 91804fe105c0e,2b374355dd21b..7314ad8e21cd1
--- a/src/cls/rgw/cls_rgw_types.h
+++ b/src/cls/rgw/cls_rgw_types.h
@@@ -343,16 -340,9 +344,17 @@@ struct cls_rgw_obj_key 
    cls_rgw_obj_key(const std::string &_name) : name(_name) {}
    cls_rgw_obj_key(const std::string& n, const std::string& i) : name(n), instance(i) {}
  
 +  std::string to_string() const {
 +    return fmt::format("{}({})", name, instance);
 +  }
 +
 +  bool empty() const {
 +    return name.empty();
 +  }
 +
    void set(const std::string& _name) {
      name = _name;
+     instance.clear();
    }
  
    bool operator==(const cls_rgw_obj_key& k) const {