summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-08-22 11:19:37 -0700
committerSamuel Just <sam.just@inktank.com>2013-09-06 16:08:41 -0700
commitb4252bff79150a95e9d075dd0b5e146ba9bf2ee5 (patch)
tree0c81a6bf3c6e5aac590388eac475bffdadfe5f1c
parent699324e0910e5e07a1ac68df8cf1108e5671ec15 (diff)
downloadceph-b4252bff79150a95e9d075dd0b5e146ba9bf2ee5.tar.gz
FileStore: add config option to disable the wbthrottle
Backport: dumpling Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> (cherry picked from commit 3528100a53724e7ae20766344e467bf762a34163)
-rw-r--r--src/common/config_opts.h1
-rw-r--r--src/os/FileStore.cc3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 52e4a819968..ad5051443c7 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -510,6 +510,7 @@ OPTION(osd_max_attr_size, OPT_U64, 65536)
OPTION(filestore, OPT_BOOL, false)
/// filestore wb throttle limits
+OPTION(filestore_wbthrottle_enable, OPT_BOOL, true)
OPTION(filestore_wbthrottle_btrfs_bytes_start_flusher, OPT_U64, 41943040)
OPTION(filestore_wbthrottle_btrfs_bytes_hard_limit, OPT_U64, 419430400)
OPTION(filestore_wbthrottle_btrfs_ios_start_flusher, OPT_U64, 500)
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index cbf7b792309..7418039ece6 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -3066,7 +3066,8 @@ int FileStore::_write(coll_t cid, const hobject_t& oid,
r = bl.length();
// flush?
- if (!replaying)
+ if (!replaying &&
+ g_conf->filestore_wbthrottle_enable)
wbthrottle.queue_wb(fd, oid, offset, len, replica);
lfn_close(fd);