From 546ed917fb3e76fef090492f3b8c322897aa4ed9 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 8 May 2013 12:18:49 -0700 Subject: [PATCH] osd: don't assert if get_omap_iterator() returns NULL Fixes: #4949 This can happen if the object does not exist and it's a write operation. Just return -ENOENT. Signed-off-by: Yehuda Sadeh --- src/osd/ReplicatedPG.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 85b62662ac93b..4e396c324f7ca 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -2922,7 +2922,10 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) ObjectMap::ObjectMapIterator iter = osd->store->get_omap_iterator( coll, soid ); - assert(iter); + if (!iter) { + result = -ENOENT; + goto fail; + } iter->upper_bound(start_after); if (filter_prefix >= start_after) iter->lower_bound(filter_prefix); for (uint64_t i = 0; -- 2.39.5