os/newstore: remove newstore_db_path option

It is simpler to have fixed locations and symlinks.

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index cc5de7858b538bcfa4f15a6c5501c46b15206e92..d3fa4e00f00fee6bdd22818c9f216c62ba79dac7 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -834,7 +834,6 @@ OPTION(newstore_overlay_max_length, OPT_INT, 65536)
 OPTION(newstore_overlay_max, OPT_INT, 32)
 OPTION(newstore_open_by_handle, OPT_BOOL, true)
 OPTION(newstore_o_direct, OPT_BOOL, true)
-OPTION(newstore_db_path, OPT_STR, "")
 OPTION(newstore_aio, OPT_BOOL, true)
 OPTION(newstore_aio_poll_ms, OPT_INT, 250)  // milliseconds
 OPTION(newstore_aio_max_queue_depth, OPT_INT, 4096)

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index f25d1ea9cea170e57487dabbc7ed0462ac485298..436dda799a2bf7ab74b95055f8b15f41eb3cdc87 100644 (file)
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -564,7 +564,6 @@ NewStore::NewStore(CephContext *cct, const string& path)
     cct(cct),
     db(NULL),
     fs(NULL),
-    db_path(cct->_conf->newstore_db_path),
     path_fd(-1),
     fsid_fd(-1),
     frag_fd(-1),
@@ -929,11 +928,6 @@ int NewStore::mkfs()
   if (r < 0)
     goto out_close_fsid;
 
-  if (db_path != "") {
-    r = symlinkat(db_path.c_str(), path_fd, "db");
-    if (r < 0)
-      goto out_close_frag;
-  }
   r = _open_db();
   if (r < 0)
     goto out_close_frag;

diff --git a/src/os/newstore/NewStore.h b/src/os/newstore/NewStore.h
index 0e3b39350efcab1a3d1e9471d61e09edeebf2564..ae1eb9bc2b2230489e014a137be00c814cc4da51 100644 (file)
--- a/src/os/newstore/NewStore.h
+++ b/src/os/newstore/NewStore.h
@@ -461,7 +461,6 @@ private:
   KeyValueDB *db;
   FS *fs;
   uuid_d fsid;
-  string db_path;
   int path_fd;  ///< open handle to $path
   int fsid_fd;  ///< open handle (locked) to $path/fsid
   int frag_fd;  ///< open handle to $path/fragments