os/bluestore: If bluestore_bluefs == false, only rocksdb_separate_wal_dir == true...

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index d52be76251bee64d404afc026d822e9ab29e21c4..6d18b936d40a3ec5256434b232b9f9420513f967 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1306,16 +1306,18 @@ int BlueStore::_open_db(bool create)
     }
 
     // wal_dir, too!
-    char walfn[PATH_MAX];
-    snprintf(walfn, sizeof(walfn), "%s/db.wal", path.c_str());
-    r = ::mkdir(walfn, 0755);
-    if (r < 0)
-      r = -errno;
-    if (r < 0 && r != -EEXIST) {
-      derr << __func__ << " failed to create " << walfn
-          << ": " << cpp_strerror(r)
-          << dendl;
-      return r;
+    if (g_conf->rocksdb_separate_wal_dir) {
+      char walfn[PATH_MAX];
+      snprintf(walfn, sizeof(walfn), "%s/db.wal", path.c_str());
+      r = ::mkdir(walfn, 0755);
+      if (r < 0)
+       r = -errno;
+      if (r < 0 && r != -EEXIST) {
+       derr << __func__ << " failed to create " << walfn
+         << ": " << cpp_strerror(r)
+         << dendl;
+       return r;
+      }
     }
   }