From: Soumya Koduri <skoduri@redhat.com>
Date: Tue, 8 Mar 2022 17:02:55 +0000 (+0530)
Subject: rgw: Update "CEPH_RGW_DIR_SUGGEST_LOG_OP" for remove entries
X-Git-Tag: v16.2.15~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52e14c522def67df5179f257898fb6f0a487348c;p=ceph.git

rgw: Update "CEPH_RGW_DIR_SUGGEST_LOG_OP" for remove entries

dir_suggest() expects "CEPH_RGW_DIR_SUGGEST_LOG_OP" flag to be set to log
completion of any pending Bucket Index transactions. This flag was not updated
for CEPH_RGW_REMOVE op entries in check_disk_state().
This change fixes the same.

Signed-off-by: Soumya Koduri <skoduri@redhat.com>
(cherry picked from commit 87c4cf053952fad1def75e733fd236a78039a77d)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e9989f430c8a..3ad4aae2e0b4 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -9051,7 +9051,7 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp,
     // encode a suggested removal of that key
     list_state.ver.epoch = io_ctx.get_last_version();
     list_state.ver.pool = io_ctx.get_id();
-    cls_rgw_encode_suggestion(CEPH_RGW_REMOVE, list_state, suggested_updates);
+    cls_rgw_encode_suggestion(CEPH_RGW_REMOVE | suggest_flag, list_state, suggested_updates);
     return -ENOENT;
   }