]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #41027 from mkogan1/wip-rgw-gc-max-objsf2
authorCasey Bodley <cbodley@users.noreply.github.com>
Thu, 13 May 2021 14:02:42 +0000 (10:02 -0400)
committerGitHub <noreply@github.com>
Thu, 13 May 2021 14:02:42 +0000 (10:02 -0400)
radosgw-admin: skip GC init on read-only admin ops

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
1  2 
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_sal.h

Simple merge
Simple merge
index 2600165d5e0f512c6ac33952fe55a7f13c65d88c,23fd3a2d460f8b01a6603d938033d73ff7b08f86..6b695899f56c9e17aee40cbd697ddfdf4ddc3134
@@@ -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),
Simple merge