rados: make 'tmap dump' gracefully handle non-tmap data

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

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index fdf7e61d41e0a0e3cbb572b1b118d9ac1ec26fad..009df5cd0af5b3a7ca0923bc86b9655e7c69a2f1 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -1813,8 +1813,15 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
       bufferlist::iterator p = outdata.begin();
       bufferlist header;
       map<string, bufferlist> kv;
-      ::decode(header, p);
-      ::decode(kv, p);
+      try {
+       ::decode(header, p);
+       ::decode(kv, p);
+      }
+      catch (buffer::error& e) {
+       cerr << "error decoding tmap " << pool_name << "/" << oid << std::endl;
+       ret = -EINVAL;
+       goto out;
+      }
       cout << "header (" << header.length() << " bytes):\n";
       header.hexdump(cout);
       cout << "\n";