From c5831fa1b716d4df7e24cc9580c9a1a75219b5da Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 26 Sep 2013 15:52:16 -0700 Subject: ceph_test_rados: improve debug output Signed-off-by: Sage Weil --- src/test/osd/Object.cc | 9 +++++---- src/test/osd/RadosModel.h | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/osd/Object.cc b/src/test/osd/Object.cc index 408cc63ac02..d4be4df1bdd 100644 --- a/src/test/osd/Object.cc +++ b/src/test/osd/Object.cc @@ -9,10 +9,11 @@ ostream &operator<<(ostream &out, const ContDesc &rhs) { - return out << "ObjNum: " << rhs.objnum - << " snap: " << rhs.cursnap - << " seqnum: " << rhs.seqnum - << " prefix: " << rhs.prefix; + return out << "(ObjNum " << rhs.objnum + << " snap " << rhs.cursnap + << " seq_num " << rhs.seqnum + //<< " prefix " << rhs.prefix + << ")"; } void VarLenGenerator::get_ranges(const ContDesc &cont, interval_set &out) { diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index a08772002e6..5c6c685c238 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -416,7 +416,7 @@ public: map::iterator j = i->second.find(oid); if (j != i->second.end()) { j->second.version = version; - cout << __func__ << " oid " << oid << " is version " << version << std::endl; + cout << __func__ << " oid " << oid << " v " << version << " " << j->second.most_recent() << std::endl; break; } } @@ -1071,6 +1071,7 @@ public: << err << std::endl; } } else { + cout << num << ": expect " << old_value.most_recent() << std::endl; assert(!old_value.deleted()); if (old_value.has_contents()) { ContDesc to_check; -- cgit v1.2.1