From: Daniel Gryniewicz <dang@redhat.com>
Date: Thu, 22 Jul 2021 15:48:08 +0000 (-0400)
Subject: RGW - Zipper - Make default args match in get_obj_state
X-Git-Tag: v16.2.8~105^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45438%2Fhead;p=ceph.git

RGW - Zipper - Make default args match in get_obj_state

The default arg for follow_olh was different between the base class and
the Rados class.  Fix it so they're the same.

Fixes: https://tracker.ceph.com/issues/51677
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 664fe75c2a88cbcc27575649a6900640f4fd90b5)

Conflicts:
	src/rgw/rgw_sal.h

Cherry-pick notes:
- changes to other parts of get_obj_state method signature
---

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index 41da8bc9d854..9b331875ab55 100644
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -474,7 +474,7 @@ class RGWObject {
     bool empty() const { return key.empty(); }
     const std::string &get_name() const { return key.name; }
 
-    virtual int get_obj_state(const DoutPrefixProvider *dpp, RGWObjectCtx *rctx, RGWBucket& bucket, RGWObjState **state, optional_yield y, bool follow_olh = false) = 0;
+    virtual int get_obj_state(const DoutPrefixProvider *dpp, RGWObjectCtx *rctx, RGWBucket& bucket, RGWObjState **state, optional_yield y, bool follow_olh = true) = 0;
     virtual int set_obj_attrs(const DoutPrefixProvider *dpp, RGWObjectCtx* rctx, RGWAttrs* setattrs, RGWAttrs* delattrs, optional_yield y, rgw_obj* target_obj = NULL) = 0;
     virtual int get_obj_attrs(RGWObjectCtx *rctx, optional_yield y, const DoutPrefixProvider *dpp, rgw_obj* target_obj = NULL) = 0;
     virtual int modify_obj_attrs(RGWObjectCtx *rctx, const char *attr_name, bufferlist& attr_val, optional_yield y, const DoutPrefixProvider *dpp) = 0;