os/bluestore: fix onode vs extent key suffix

I set the extent key suffix as 'x', thinking that was
not a valid hex character and would let us quickly
identify extent keys (vs onode keys, which end with an
encoded u64). But that doesn't work: the keys encode
integer values in raw form--not in hex
(pretty_binary_string just prints it out that way in
the debug log).

Fix by appending 'o' to the onode keys, so that we will
always have a trailing 'o' or 'x' and can use the last
char reliably to determine the type.

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 1090f7a10717fc738249a8138b255cb153a58f5c..5865b933d11e77015b072dcc53c6c32f846fd692 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -83,7 +83,9 @@ const string PREFIX_SHARED_BLOB = "X"; // u64 offset -> shared_blob_t
  *
  * encoded u64: snap
  * encoded u64: generation
+ * 'o'
  */
+#define ONODE_KEY_SUFFIX 'o'
 
 /*
  * string encoding in the key
@@ -103,8 +105,7 @@ const string PREFIX_SHARED_BLOB = "X"; // u64 offset -> shared_blob_t
  *
  * object prefix key
  * u32
- * 'x'  (this char can be anything that is not part of a u64 (hex)
- *       encoding so we can distinguish this key from an object key)
+ * 'x'
  */
 #define EXTENT_SHARD_KEY_SUFFIX 'x'
 
@@ -295,6 +296,8 @@ static void get_object_key(const ghobject_t& oid, string *key)
   _key_encode_u64(oid.hobj.snap, key);
   _key_encode_u64(oid.generation, key);
 
+  key->push_back(ONODE_KEY_SUFFIX);
+
   // sanity check
   if (true) {
     ghobject_t t;
@@ -356,10 +359,15 @@ static int get_key_object(const string& key, ghobject_t *oid)
 
   p = _key_decode_u64(p, &oid->hobj.snap.val);
   p = _key_decode_u64(p, &oid->generation);
+
+  if (*p != ONODE_KEY_SUFFIX) {
+    return -7;
+  }
+  p++;
   if (*p) {
     // if we get something other than a null terminator here,
     // something goes wrong.
-    return -7;
+    return -8;
   }
 
   return 0;