ceph_test_rados: improve debug output

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/test/osd/Object.cc b/src/test/osd/Object.cc
index 408cc63ac0200b2df8f834fee178fd6e43fede5e..d4be4df1bdd07a5a4a0fb8a7c2f3e2fc90a35f5e 100644 (file)
--- 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 a08772002e6efbcdf4b65bffccc4519021a7fad2..5c6c685c2384f786afe79a3be4718d6789f24933 100644 (file)
--- 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;