RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/PrimaryLogPG: do_op: move up LIST_SNAPS specialness

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-08-31 21:06:29 -04:00
parent 4fe9213b90
commit 881f4be3a6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osd/PrimaryLogPG.cc
View File

@ -2119,6 +2119,13 @@ void PrimaryLogPG::do_op(OpRequestRef& op)
m->has_flag(CEPH_OSD_FLAG_MAP_SNAP_CLONE),
&missing_oid);
// LIST_SNAPS needs the ssc too
if (obc &&
m->get_snapid() == CEPH_SNAPDIR &&
!obc->ssc) {
obc->ssc = get_snapset_context(oid, true);
}
if (r == -EAGAIN) {
// If we're not the primary of this OSD, we just return -EAGAIN. Otherwise,
// we have to wait for the object.
@ -9757,11 +9764,6 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
<< dendl;
*pobc = obc;
// always populate ssc for SNAPDIR...
if (!obc->ssc)
obc->ssc = get_snapset_context(
oid, true);
return 0;
}
// we want a snap