From: Samuel Just <sam.just@inktank.com>
Date: Thu, 22 Aug 2013 18:19:37 +0000 (-0700)
Subject: FileStore: add config option to disable the wbthrottle
X-Git-Tag: v0.69~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3528100a53724e7ae20766344e467bf762a34163;p=ceph.git

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>
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 894051216982..6453e5a207c3 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -524,6 +524,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 814073736859..d4d540df8760 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2600,7 +2600,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);