summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-09-26 15:52:16 -0700
committerSage Weil <sage@inktank.com>2013-09-26 18:15:32 -0700
commitc5831fa1b716d4df7e24cc9580c9a1a75219b5da (patch)
treece367815918dff503a97e3c7c905d08ac6ff9d56
parenteec315f2489e89b4b5154998aaf3b20cfe57b722 (diff)
downloadceph-c5831fa1b716d4df7e24cc9580c9a1a75219b5da.tar.gz
ceph_test_rados: improve debug outputwip-testrados
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/test/osd/Object.cc9
-rw-r--r--src/test/osd/RadosModel.h3
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<uint64_t> &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<string,ObjectDesc>::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;