From: J. Eric Ivancich <ivancich@redhat.com>
Date: Wed, 23 Jun 2021 14:37:52 +0000 (-0400)
Subject: Merge pull request #39358 from Jeegn-Chen/wip-tracker-49206
X-Git-Tag: v17.1.0~1575
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da5d094f2647a6a32316cdd11e40fce91c572df8;p=ceph.git

Merge pull request #39358 from Jeegn-Chen/wip-tracker-49206

rgw: avoid infinite loop when deleting a bucket

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
---

da5d094f2647a6a32316cdd11e40fce91c572df8
diff --cc src/rgw/rgw_rados.cc
index b198b4c167e4,f07da1750098..e24ae308b491
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -8679,9 -8642,9 +8688,9 @@@ int RGWRados::cls_bucket_list_unordered
      // now convert the key (oid) to an rgw_obj_key since that will
      // separate out the namespace, name, and instance
      rgw_obj_key obj_key;
-     bool parsed = rgw_obj_key::parse_raw_oid(key, &obj_key);
+     bool parsed = rgw_obj_key::parse_raw_oid(start_after.name, &obj_key);
      if (!parsed) {
 -      ldout(cct, 0) <<
 +      ldpp_dout(dpp, 0) <<
  	"ERROR: RGWRados::cls_bucket_list_unordered received an invalid "
  	"start marker: '" << start_after << "'" << dendl;
        return -EINVAL;