From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Dec 2015 20:55:09 +0000 (-0500)
Subject: os/kstore/KStore: fix object key decode with key
X-Git-Tag: v10.0.3~154^2~126
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=499b40f5f4d365f0b6a45fcd8acb8e5fae4b1576;p=ceph.git

os/kstore/KStore: fix object key decode with key

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

diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index ccdd1f663e12..a530a9bcf727 100644
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -344,6 +344,7 @@ static int get_key_object(const string& key, ghobject_t *oid)
     if (r < 0)
       return -9;
     p += r + 1;
+    oid->hobj.set_key(okey);
   } else {
     // malformed
     return -7;
@@ -877,6 +878,7 @@ void KStore::_close_db()
 
 int KStore::_open_collections(int *errors)
 {
+  assert(coll_map.empty());
   KeyValueDB::Iterator it = db->get_iterator(PREFIX_COLL);
   for (it->upper_bound(string());
        it->valid();
@@ -1339,7 +1341,7 @@ int KStore::fsck()
       ++errors;
     }
   }
-
+  coll_map.clear();
  out_alloc:
   _close_alloc();
  out_db: