From: Haomai Wang <haomaiwang@gmail.com>
Date: Tue, 9 Sep 2014 09:48:46 +0000 (+0800)
Subject: KeyValueStore: Fix scrub causing inconsistence state
X-Git-Tag: v0.86~114^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2430%2Fhead;p=ceph.git

KeyValueStore: Fix scrub causing inconsistence state

Fix #8589
Backport #Firefly
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/os/GenericObjectMap.cc b/src/os/GenericObjectMap.cc
index 4412a9102c83..00387ad666d6 100644
--- a/src/os/GenericObjectMap.cc
+++ b/src/os/GenericObjectMap.cc
@@ -121,10 +121,7 @@ string GenericObjectMap::header_key(const coll_t &cid, const ghobject_t &oid)
   full_name.append(GHOBJECT_KEY_SEP_S);
 
   t = buf;
-  if (oid.hobj.pool == -1)
-    t += snprintf(t, end - t, "none");
-  else
-    t += snprintf(t, end - t, "%llx", (long long unsigned)oid.hobj.pool);
+  t += snprintf(t, end - t, "%lld", (long long)oid.hobj.pool);
   full_name += string(buf);
   full_name.append(GHOBJECT_KEY_SEP_S);