Skip to content

Commit e174ece

Browse files
committed
rgw: remove RGWRados::list_lc_progress()
it only forwarded to RGWLC::list_lc_progress(), which rgw_admin.cc can now call without casting to RadosStore Signed-off-by: Casey Bodley <[email protected]>
1 parent 3e4664a commit e174ece

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

src/rgw/driver/rados/rgw_rados.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9292,13 +9292,6 @@ int RGWRados::process_gc(bool expired_only, optional_yield y)
92929292
return gc->process(expired_only, y);
92939293
}
92949294

9295-
int RGWRados::list_lc_progress(string& marker, uint32_t max_entries,
9296-
vector<std::unique_ptr<rgw::sal::Lifecycle::LCEntry>>& progress_map,
9297-
int& index)
9298-
{
9299-
return lc->list_lc_progress(marker, max_entries, progress_map, index);
9300-
}
9301-
93029295
int RGWRados::process_lc(const std::unique_ptr<rgw::sal::Bucket>& optional_bucket)
93039296
{
93049297
RGWLC lc;

src/rgw/driver/rados/rgw_rados.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,9 +1560,6 @@ class RGWRados
15601560
int defer_gc(const DoutPrefixProvider *dpp, RGWObjectCtx* ctx, RGWBucketInfo& bucket_info, const rgw_obj& obj, optional_yield y);
15611561

15621562
int process_lc(const std::unique_ptr<rgw::sal::Bucket>& optional_bucket);
1563-
int list_lc_progress(std::string& marker, uint32_t max_entries,
1564-
std::vector<std::unique_ptr<rgw::sal::Lifecycle::LCEntry>>& progress_map,
1565-
int& index);
15661563

15671564
int bucket_check_index(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info,
15681565
std::map<RGWObjCategory, RGWStorageStats> *existing_stats,

src/rgw/rgw_admin.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8825,9 +8825,9 @@ int main(int argc, const char **argv)
88258825
if (max_entries < 0) {
88268826
max_entries = MAX_LC_LIST_ENTRIES;
88278827
}
8828+
RGWLC* lc = driver->get_rgwlc();
88288829
do {
8829-
int ret = static_cast<rgw::sal::RadosStore*>(driver)->getRados()->list_lc_progress(marker, max_entries,
8830-
bucket_lc_map, index);
8830+
int ret = lc->list_lc_progress(marker, max_entries, bucket_lc_map, index);
88318831
if (ret < 0) {
88328832
cerr << "ERROR: failed to list objs: " << cpp_strerror(-ret)
88338833
<< std::endl;

0 commit comments

Comments
 (0)