summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-01-19 17:33:25 -0800
committerSage Weil <sage@inktank.com>2013-01-22 14:47:39 -0800
commit44dca5c8c5058acf9bc391303dc77893793ce0be (patch)
tree5d0017ac6ed6cb9f5d5050da0edc2159d6ec8f6b
parentcfe4b8519363f92f84f724a812aa41257402865f (diff)
downloadceph-44dca5c8c5058acf9bc391303dc77893793ce0be.tar.gz
filestore: disable extra committing queue allowance
The motivation here is if there is a problem draining the op queue during a sync. For XFS and ext4, this isn't generally a problem: you can continue to make writes while a syncfs(2) is in progress. There are currently some possible implementation issues with btrfs, but we have not demonstrated them recently. Meanwhile, this can cause queue length spikes that screw up latency. During a commit, we allow too much into the queue (say, recovery operations). After the sync finishes, we have to drain it out before we can queue new work (say, a higher priority client request). Having a deep queue below the point where priorities order work limits the value of the priority queue. Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/common/config_opts.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index a5df112576f..fc34cbca6e1 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -411,8 +411,8 @@ OPTION(filestore_journal_writeahead, OPT_BOOL, false)
OPTION(filestore_journal_trailing, OPT_BOOL, false)
OPTION(filestore_queue_max_ops, OPT_INT, 500)
OPTION(filestore_queue_max_bytes, OPT_INT, 100 << 20)
-OPTION(filestore_queue_committing_max_ops, OPT_INT, 500) // this is ON TOP of filestore_queue_max_*
-OPTION(filestore_queue_committing_max_bytes, OPT_INT, 100 << 20) // "
+OPTION(filestore_queue_committing_max_ops, OPT_INT, 0) // this is ON TOP of filestore_queue_max_*
+OPTION(filestore_queue_committing_max_bytes, OPT_INT, 0) // "
OPTION(filestore_op_threads, OPT_INT, 2)
OPTION(filestore_op_thread_timeout, OPT_INT, 60)
OPTION(filestore_op_thread_suicide_timeout, OPT_INT, 180)