From: David Zafman <david.zafman@inktank.com>
Date: Tue, 3 Sep 2013 20:35:50 +0000 (-0700)
Subject: osd: Add assert() on collection_getattr() failure instead of later decode crash
X-Git-Tag: v0.71~69^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c0aecbe4a90072a588f0f741717c2a017a632d1;p=ceph.git

osd: Add assert() on collection_getattr() failure instead of later decode crash

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f319d160a39f..6afa5599376c 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2254,7 +2254,8 @@ epoch_t PG::peek_map_epoch(ObjectStore *store, coll_t coll, hobject_t &infos_oid
   snapid_t snap;
   bool ok = coll.is_pg(pgid, snap);
   assert(ok);
-  store->collection_getattr(coll, "info", *bl);
+  int r = store->collection_getattr(coll, "info", *bl);
+  assert(r > 0);
   bufferlist::iterator bp = bl->begin();
   __u8 struct_v = 0;
   ::decode(struct_v, bp);