From 7ec9ecd90107814c7eb6a9dc5851f3ca715b382c Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 11 May 2016 17:36:43 -0700 Subject: [PATCH 1/3] osd: Add assert() to help diagnose trim_object() crash Fix derr message too Signed-off-by: David Zafman --- src/osd/ReplicatedPG.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 43ef40ffb99..a8fdb3ae1e5 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3361,7 +3361,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); @@ -3371,6 +3371,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 old_snaps(coi.snaps.begin(), coi.snaps.end()); From 472502a45f0cb923177b1eb3546881ea67e55663 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 10 May 2016 10:26:38 -0700 Subject: [PATCH 2/3] osd: Add assert() to help diagnose handle_osd_ping() crash Signed-off-by: David Zafman --- src/osd/OSD.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index ed1e4bd2e09..5fc930de522 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3970,6 +3970,7 @@ void OSD::handle_osd_ping(MOSDPing *m) } OSDMapRef curmap = service.get_osdmap(); + assert(curmap); switch (m->op) { From 2fb0530a5650bcdb9c89d8bdd2504a7dd1642678 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 17 May 2016 17:14:07 -0700 Subject: [PATCH 3/3] test: Fix grouping of mon_cephdf_commands by moving to MON_TESTS Signed-off-by: David Zafman --- qa/workunits/cephtool/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 1e18b78111a..24ae7847a40 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1878,6 +1878,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" @@ -1885,7 +1886,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