]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
KeyValueStore: Fix scrub causing inconsistence state 2430/head
authorHaomai Wang <haomaiwang@gmail.com>
Tue, 9 Sep 2014 09:48:46 +0000 (17:48 +0800)
committerHaomai Wang <haomaiwang@gmail.com>
Tue, 9 Sep 2014 09:54:14 +0000 (17:54 +0800)
Fix #8589
Backport #Firefly
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
src/os/GenericObjectMap.cc

index 4412a9102c8302abe3b6a226fbb7f823feb52f3e..00387ad666d6d66a837e5079ff672adf12800841 100644 (file)
@@ -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);