RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21151 from xiexingguo/wip-prune-olr

Browse Source 
osd/PGBackend: drop input "snapid_t" from objects_list_range()

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2018-04-07 17:25:48 +08:00 committed by GitHub
commit 9fda4d2b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/PG.cc
View File

@ -4338,9 +4338,7 @@ void PG::scrub_unreserve_replicas()
}
}
void PG::_scan_rollback_obs(
const vector<ghobject_t> &rollback_obs,
ThreadPool::TPHandle &handle)
void PG::_scan_rollback_obs(const vector<ghobject_t> &rollback_obs)
{
ObjectStore::Transaction t;
eversion_t trimmed_to = last_rollback_info_trimmed_to_applied;
@ -4532,7 +4530,6 @@ int PG::build_scrub_map_chunk(
pos.ret = get_pgbackend()->objects_list_range(
start,
end,
0,
&pos.ls,
&rollback_obs);
if (pos.ret < 0) {
@ -4542,7 +4539,7 @@ int PG::build_scrub_map_chunk(
if (pos.ls.empty()) {
break;
}
_scan_rollback_obs(rollback_obs, handle);
_scan_rollback_obs(rollback_obs);
pos.pos = 0;
return -EINPROGRESS;
}

4
src/osd/PG.h
View File

@ -1724,9 +1724,7 @@ protected:
void scrub_clear_state();
void _scan_snaps(ScrubMap &map);
void _repair_oinfo_oid(ScrubMap &map);
void _scan_rollback_obs(
const vector<ghobject_t> &rollback_obs,
ThreadPool::TPHandle &handle);
void _scan_rollback_obs(const vector<ghobject_t> &rollback_obs);
void _request_scrub_map(pg_shard_t replica, eversion_t version,
hobject_t start, hobject_t end, bool deep,
bool allow_preemption);

1
src/osd/PGBackend.cc
View File

@ -380,7 +380,6 @@ int PGBackend::objects_list_partial(
int PGBackend::objects_list_range(
const hobject_t &start,
const hobject_t &end,
snapid_t seq,
vector<hobject_t> *ls,
vector<ghobject_t> *gen_obs)
{

1
src/osd/PGBackend.h
View File

@ -533,7 +533,6 @@ typedef ceph::shared_ptr<const OSDMap> OSDMapRef;
int objects_list_range(
const hobject_t &start,
const hobject_t &end,
snapid_t seq,
vector<hobject_t> *ls,
vector<ghobject_t> *gen_obs=0);