os/bluestore: fix wal dir presence verification

Fixes: http://tracker.ceph.com/issues/36606
Signed-off-by: Igor Fedotov <ifedotov@suse.com>

diff --git a/src/os/bluestore/BlueRocksEnv.cc b/src/os/bluestore/BlueRocksEnv.cc
index f665f496a36882f07e137b4fd444f8715f4108f9..ab3bb5600fde28be725358d910f57cb67b2ab8b2 100644 (file)
--- a/src/os/bluestore/BlueRocksEnv.cc
+++ b/src/os/bluestore/BlueRocksEnv.cc
@@ -391,7 +391,7 @@ rocksdb::Status BlueRocksEnv::NewDirectory(
   std::unique_ptr<rocksdb::Directory>* result)
 {
   if (!fs->dir_exists(name))
-    return rocksdb::Status::IOError(name, strerror(ENOENT));
+    return rocksdb::Status::NotFound(name, strerror(ENOENT));
   result->reset(new BlueRocksDirectory(fs));
   return rocksdb::Status::OK();
 }
@@ -414,7 +414,7 @@ rocksdb::Status BlueRocksEnv::GetChildren(
   result->clear();
   int r = fs->readdir(dir, result);
   if (r < 0)
-    return rocksdb::Status::IOError(dir, strerror(ENOENT));//    return err_to_status(r);
+    return rocksdb::Status::NotFound(dir, strerror(ENOENT));//    return err_to_status(r);
   return rocksdb::Status::OK();
 }
 

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 328210e61e893edff0eb4fae49e42584a86f4f88..1e782e3a5fae7e65a9833b1c8096c5b382876c3b 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5132,7 +5132,7 @@ int BlueStore::_open_db(bool create, bool to_repair_db)
       std::vector<std::string> res;
       // check for dir presence
       auto r = env->GetChildren(fn+".wal", &res);
-      if (r == rocksdb::Status::NotFound()) {
+      if (r.IsNotFound()) {
        kv_options.erase("separate_wal_dir");
       }
     }