RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11354 from liewegas/wip-rocksdb

Browse Source 
rocksdb: update to latest, and make it the default for the mons
This commit is contained in:
Sage Weil 2016-10-18 21:38:53 -05:00 committed by GitHub
commit 0aeea8941b
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PendingReleaseNotes
View File

@ -35,6 +35,15 @@
1
}.
* If your monitors are configured to use the experimental rocksdb
backend, you may need to manually adjust the store before upgraded.
Monitors now explicitly record what keyvalue backend type they use. If
the kv_backend file is missing from the mon_data directory (normally
/var/lib/ceph/mon/$cluster-$name/kv_backend) it is now assumed to be leveldb.
If you had manually configured the mon to use rocksdb, this file should
be created and filled with the string "rocksdb" (newline optional).
11.0.0
------

2
src/common/config_opts.h
View File

@ -337,7 +337,7 @@ OPTION(mon_inject_transaction_delay_probability, OPT_DOUBLE, 0) // range [0, 1]
OPTION(mon_sync_provider_kill_at, OPT_INT, 0) // kill the sync provider at a specific point in the work flow
OPTION(mon_sync_requester_kill_at, OPT_INT, 0) // kill the sync requester at a specific point in the work flow
OPTION(mon_force_quorum_join, OPT_BOOL, false) // force monitor to join quorum even if it has been previously removed from the map
OPTION(mon_keyvaluedb, OPT_STR, "leveldb") // type of keyvaluedb backend
OPTION(mon_keyvaluedb, OPT_STR, "rocksdb") // type of keyvaluedb backend
// UNSAFE -- TESTING ONLY! Allows addition of a cache tier with preexisting snaps
OPTION(mon_debug_unsafe_allow_tier_with_nonempty_snaps, OPT_BOOL, false)

3
src/kv/KeyValueDB.cc
View File

@ -25,8 +25,7 @@ KeyValueDB *KeyValueDB::create(CephContext *cct, const string& type,
}
#endif
#ifdef HAVE_LIBROCKSDB
if (type == "rocksdb" &&
cct->check_experimental_feature_enabled("rocksdb")) {
if (type == "rocksdb") {
return new RocksDBStore(cct, dir, p);
}
#endif

3
src/mon/MonitorDBStore.h
View File

@ -644,7 +644,8 @@ class MonitorDBStore
string kv_type;
int r = read_meta("kv_backend", &kv_type);
if (r < 0) {
kv_type = g_conf->mon_keyvaluedb;
// assume old monitors that did not mark the type were leveldb.
kv_type = "leveldb";
r = write_meta("kv_backend", kv_type);
if (r < 0)
return r;

2
src/rocksdb

@ -1 +1 @@
Subproject commit bf09c048f3449135339dd52d7bd16820b1a51389
Subproject commit 043cb62d638d94d840038db86f46b369d9bb1bc1