summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zafman <david.zafman@inktank.com>2013-09-03 13:35:50 -0700
committerDavid Zafman <david.zafman@inktank.com>2013-09-23 11:57:09 -0700
commit1c0aecbe4a90072a588f0f741717c2a017a632d1 (patch)
tree08a9b5f306fcf0896c9925d4ae1057ca05dbc89f
parent0655cc156f647244ded0493ec248bd0df5ccf09c (diff)
downloadceph-1c0aecbe4a90072a588f0f741717c2a017a632d1.tar.gz
osd: Add assert() on collection_getattr() failure instead of later decode crash
Signed-off-by: David Zafman <david.zafman@inktank.com>
-rw-r--r--src/osd/PG.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f319d160a39..6afa5599376 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);