KeyValueStore: Fix upgrade from non-exist superblock OSD version error

If user upgrade OSD from Firefly or lower than 0.84, it won't get valid
keyvaluestore backend.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc
index 34c56f54295ba9cc979565a8d0b362394cb558ec..732a96c0ea2eb9c70eea1c03396471464bd7d341 100644 (file)
--- a/src/os/KeyValueStore.cc
+++ b/src/os/KeyValueStore.cc
@@ -847,6 +847,7 @@ int KeyValueStore::mount()
     }
   }
   
+  superblock.backend = g_conf->keyvaluestore_backend;
   ret = read_superblock();
   if (ret < 0) {
     ret = -EINVAL;
@@ -872,7 +873,8 @@ int KeyValueStore::mount()
   assert(current_fd >= 0);
 
   {
-
+    if (superblock.backend.empty())
+      superblock.backend = g_conf->keyvaluestore_backend;
     KeyValueDB *store = KeyValueDB::create(g_ceph_context,
                                           superblock.backend,
                                           current_fn.c_str());