From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 16 Jun 2016 01:20:46 +0000 (+0800)
Subject: os/filestore: add sanity check for omap_store initializing
X-Git-Tag: ses5-milestone5~240^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec7922910ec7fe07bf0f8b29c43e7b71f6659a6a;p=ceph.git

os/filestore: add sanity check for omap_store initializing

Which can fail.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 6ccbf900217..39f48061e08 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -1625,9 +1625,14 @@ int FileStore::mount()
     }
 
     if (superblock.omap_backend == "rocksdb")
-      omap_store->init(g_conf->filestore_rocksdb_options);
+      ret = omap_store->init(g_conf->filestore_rocksdb_options);
     else
-      omap_store->init();
+      ret = omap_store->init();
+
+    if (ret < 0) {
+      derr << "Error initializing omap_store: " << cpp_strerror(ret) << dendl;
+      goto close_current_fd;
+    }
 
     stringstream err;
     if (omap_store->create_and_open(err)) {