From: Xiaoxi Chen <xiaoxi.chen@intel.com>
Date: Wed, 8 Apr 2015 16:13:10 +0000 (+0800)
Subject: os/Newstore:Change assert in get_onode
X-Git-Tag: v9.1.0~242^2~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0981428123e4e5064f5618fe988d0b38dddb0af7;p=ceph.git

os/Newstore:Change assert in get_onode

db->get will return negtive when key is not found.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
---

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index 9d8a2d6859a..a84e38a5caf 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -537,8 +537,8 @@ NewStore::OnodeRef NewStore::Collection::get_onode(
   int r = store->db->get(PREFIX_OBJ, key, &v);
   dout(20) << " r " << r << " v.len " << v.length() << dendl;
   Onode *on;
-  assert(r >= 0);
   if (v.length() == 0) {
+    assert(r == -ENOENT);
     if (!create)
       return OnodeRef();
 
@@ -547,6 +547,7 @@ NewStore::OnodeRef NewStore::Collection::get_onode(
     on->dirty = true;
   } else {
     // loaded
+    assert(r >=0);
     on = new Onode(oid, key);
     bufferlist::iterator p = v.begin();
     ::decode(on->onode, p);