RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-15 15:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/osd_types: pass legacy flag to from_snap_set

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-04-05 15:14:31 -04:00
parent bbc63bf204
commit f063506b21
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osd/osd_types.cc
View File

@ -4781,7 +4781,7 @@ ostream& operator<<(ostream& out, const SnapSet& cs)
}
}
void SnapSet::from_snap_set(const librados::snap_set_t& ss)
void SnapSet::from_snap_set(const librados::snap_set_t& ss, bool legacy)
{
// NOTE: our reconstruction of snaps (and the snapc) is not strictly
// correct: it will not include snaps that still logically exist
@ -4807,6 +4807,13 @@ void SnapSet::from_snap_set(const librados::snap_set_t& ss)
for (vector<pair<uint64_t, uint64_t> >::const_iterator q =
p->overlap.begin(); q != p->overlap.end(); ++q)
clone_overlap[p->cloneid].insert(q->first, q->second);
if (!legacy) {
// p->snaps is ascending; clone_snaps is descending
vector<snapid_t>& v = clone_snaps[p->cloneid];
for (auto q = p->snaps.rbegin(); q != p->snaps.rend(); ++q) {
v.push_back(*q);
}
}
}
}

2
src/osd/osd_types.h
View File

@ -4317,7 +4317,7 @@ struct SnapSet {
}
/// populate SnapSet from a librados::snap_set_t
void from_snap_set(const librados::snap_set_t& ss);
void from_snap_set(const librados::snap_set_t& ss, bool legacy);
/// get space accounted to clone
uint64_t get_clone_bytes(snapid_t clone) const;