From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Thu, 13 May 2021 14:02:42 +0000 (-0400)
Subject: Merge pull request #41027 from mkogan1/wip-rgw-gc-max-objsf2
X-Git-Tag: v17.1.0~1975
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a5dc35704c11a48afeb2cc0b54158e2273156acc;p=ceph-ci.git

Merge pull request #41027 from mkogan1/wip-rgw-gc-max-objsf2

radosgw-admin: skip GC init on read-only admin ops

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
---

a5dc35704c11a48afeb2cc0b54158e2273156acc
diff --cc src/rgw/rgw_rados.h
index 2600165d5e0,23fd3a2d460..6b695899f56
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@@ -480,8 -480,9 +480,9 @@@ protected
    RGWIndexCompletionManager *index_completion_manager{nullptr};
  
    bool use_cache{false};
+   bool use_gc{true};
  
 -  int get_obj_head_ioctx(const RGWBucketInfo& bucket_info, const rgw_obj& obj, librados::IoCtx *ioctx);
 +  int get_obj_head_ioctx(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw_obj& obj, librados::IoCtx *ioctx);
  public:
    RGWRados(): timer(NULL),
                 gc(NULL), lc(NULL), obj_expirer(NULL), use_gc_thread(false), use_lc_thread(false), quota_threads(false),