summaryrefslogtreecommitdiffstats
path: root/src/osd/PGBackend.cc
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2014-06-02 22:44:49 +0200
committerSamuel Just <sam.just@inktank.com>2014-06-27 22:25:52 +0200
commitd48a737a6f8daa463ddf82106455b2efe7715a33 (patch)
tree1d5ee55ae22ef3e8be4ce9618e7d9ac5bc5ffe8d /src/osd/PGBackend.cc
parentosd/: plumb rollback_trim_to through interfaces and messages (diff)
downloadceph-d48a737a6f8daa463ddf82106455b2efe7715a33.tar.xz
ceph-d48a737a6f8daa463ddf82106455b2efe7715a33.zip
osd/: in scrub, check for and remove obsolete rollback objs
Signed-off-by: Samuel Just <sam.just@inktank.com>
Diffstat (limited to 'src/osd/PGBackend.cc')
-rw-r--r--src/osd/PGBackend.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index dad17f9cd26..6a1a818eae6 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -148,7 +148,8 @@ int PGBackend::objects_list_range(
const hobject_t &start,
const hobject_t &end,
snapid_t seq,
- vector<hobject_t> *ls)
+ vector<hobject_t> *ls,
+ vector<ghobject_t> *gen_obs)
{
assert(ls);
vector<ghobject_t> objects;
@@ -164,6 +165,8 @@ int PGBackend::objects_list_range(
++i) {
if (i->is_no_gen()) {
ls->push_back(i->hobj);
+ } else if (gen_obs) {
+ gen_obs->push_back(*i);
}
}
return r;