RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9084 from dzafman/wip-dz-misc

Browse Source 
Wip dz misc

Reviewed-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2016-06-01 14:16:32 -07:00
commit 542931f69c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/workunits/cephtool/test.sh
View File

@ -1893,6 +1893,7 @@ MON_TESTS+=" mon_crushmap_validation"
MON_TESTS+=" mon_ping"
MON_TESTS+=" mon_deprecated_commands"
MON_TESTS+=" mon_caps"
MON_TESTS+=" mon_cephdf_commands"
OSD_TESTS+=" osd_bench"
OSD_TESTS+=" osd_negative_filestore_merge_threshold"
OSD_TESTS+=" tiering_agent"
@ -1900,7 +1901,6 @@ OSD_TESTS+=" tiering_agent"
MDS_TESTS+=" mds_tell"
MDS_TESTS+=" mon_mds"
MDS_TESTS+=" mon_mds_metadata"
MDS_TESTS+=" mon_cephdf_commands"
TESTS+=$MON_TESTS
TESTS+=$OSD_TESTS

1
src/osd/OSD.cc
View File

@ -3992,6 +3992,7 @@ void OSD::handle_osd_ping(MOSDPing *m)
}
OSDMapRef curmap = service.get_osdmap();
assert(curmap);
switch (m->op) {

3
src/osd/ReplicatedPG.cc
View File

@ -3347,7 +3347,7 @@ ReplicatedPG::OpContextUPtr ReplicatedPG::trim_object(const hobject_t &coid)
bufferlist bl;
ObjectContextRef obc = get_object_context(coid, false, NULL);
if (!obc) {
derr << __func__ << "could not find coid " << coid << dendl;
derr << __func__ << " could not find coid " << coid << dendl;
assert(0);
}
assert(obc->ssc);
@ -3357,6 +3357,7 @@ ReplicatedPG::OpContextUPtr ReplicatedPG::trim_object(const hobject_t &coid)
obc->ssc->snapset.head_exists ? CEPH_NOSNAP:CEPH_SNAPDIR, coid.get_hash(),
info.pgid.pool(), coid.get_namespace());
ObjectContextRef snapset_obc = get_object_context(snapoid, false);
assert(snapset_obc);
object_info_t &coi = obc->obs.oi;
set<snapid_t> old_snaps(coi.snaps.begin(), coi.snaps.end());