From 22c9310bd8663e458ba47b70def6f4fe2b843004 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 5 Oct 2015 15:34:58 -0400 Subject: [PATCH] os/newstore: remove newstore_db_path option It is simpler to have fixed locations and symlinks. Signed-off-by: Sage Weil --- src/common/config_opts.h | 1 - src/os/newstore/NewStore.cc | 6 ------ src/os/newstore/NewStore.h | 1 - 3 files changed, 8 deletions(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index cc5de7858b538..d3fa4e00f00fe 100644 --- 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 f25d1ea9cea17..436dda799a2bf 100644 --- 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 0e3b39350efca..ae1eb9bc2b223 100644 --- 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 -- 2.39.5