config_opts.h: increase xfs,btrfs wbthrottle defaults

Also increase fd limit defaults to accomodate the larger number
of fds.

Fixes: #5692
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Mark Nelson <mark.nelson@inktank.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 7a9adf7293e99f69d0c06ce4d3db7162400255cc..bed4cc4c91c5385330e63a81a8389d85076d5653 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -25,3 +25,9 @@ v0.67
   copy operations. The S3 response will now return extra <Progress>
   field under the <CopyResult> container. The Swift response will
   now send the progress as a json array.
+
+* ceph-osd now requires a max fd limit of at least
+  filestore_wbthrottle_(xfs|btrfs)_inodes_hard_limit (5000 by default)
+  in order to accomodate the new write back throttle system.  upstart
+  now sets the fd limit to 32k.  sysvinit will set it to 32k by default
+  (still overrideable via max_open_files).

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index b43808e211cf2d3e2836c977c18d1188845d31c8..335a92071521aeab759c1d8034c36cef2643f6cf 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -501,20 +501,20 @@ OPTION(osd_max_attr_size, OPT_U64, 65536)
 OPTION(filestore, OPT_BOOL, false)
 
 /// filestore wb throttle limits
-OPTION(filestore_wbthrottle_btrfs_bytes_start_flusher, OPT_U64, 10<<20)
-OPTION(filestore_wbthrottle_btrfs_bytes_hard_limit, OPT_U64, 100<<20)
-OPTION(filestore_wbthrottle_btrfs_ios_start_flusher, OPT_U64, 100)
-OPTION(filestore_wbthrottle_btrfs_ios_hard_limit, OPT_U64, 1000)
-OPTION(filestore_wbthrottle_btrfs_inodes_start_flusher, OPT_U64, 100)
-OPTION(filestore_wbthrottle_xfs_bytes_start_flusher, OPT_U64, 10<<20)
-OPTION(filestore_wbthrottle_xfs_bytes_hard_limit, OPT_U64, 100<<20)
-OPTION(filestore_wbthrottle_xfs_ios_start_flusher, OPT_U64, 10)
-OPTION(filestore_wbthrottle_xfs_ios_hard_limit, OPT_U64, 100)
-OPTION(filestore_wbthrottle_xfs_inodes_start_flusher, OPT_U64, 10)
+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)
+OPTION(filestore_wbthrottle_btrfs_ios_hard_limit, OPT_U64, 5000)
+OPTION(filestore_wbthrottle_btrfs_inodes_start_flusher, OPT_U64, 500)
+OPTION(filestore_wbthrottle_xfs_bytes_start_flusher, OPT_U64, 41943040)
+OPTION(filestore_wbthrottle_xfs_bytes_hard_limit, OPT_U64, 419430400)
+OPTION(filestore_wbthrottle_xfs_ios_start_flusher, OPT_U64, 500)
+OPTION(filestore_wbthrottle_xfs_ios_hard_limit, OPT_U64, 5000)
+OPTION(filestore_wbthrottle_xfs_inodes_start_flusher, OPT_U64, 500)
 
 /// These must be less than the fd limit
-OPTION(filestore_wbthrottle_btrfs_inodes_hard_limit, OPT_U64, 256)
-OPTION(filestore_wbthrottle_xfs_inodes_hard_limit, OPT_U64, 100)
+OPTION(filestore_wbthrottle_btrfs_inodes_hard_limit, OPT_U64, 5000)
+OPTION(filestore_wbthrottle_xfs_inodes_hard_limit, OPT_U64, 5000)
 
 // Tests index failure paths
 OPTION(filestore_index_retry_probability, OPT_DOUBLE, 0)

diff --git a/src/init-ceph.in b/src/init-ceph.in
index b0ed353f8e7fa429cd473cbaf06b8524966c91ab..8eb02f89214380fa0361816586df26fc64372179 100644 (file)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -241,7 +241,7 @@ for name in $what; do
     case "$command" in
        start)
             # Increase max_open_files, if the configuration calls for it.
-            get_conf max_open_files "8192" "max open files"
+            get_conf max_open_files "32768" "max open files"
 
             # build final command
            wrap=""

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index e26bbc790b9ca281ff7bf651aaf579b21896fd46..c0bf4d68c1cb1875cb258816d3d825b06ce31cbd 100644 (file)
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -6,7 +6,7 @@ stop on runlevel [!2345] or stopping ceph-osd-all
 respawn
 respawn limit 5 30
 
-limit nofile 16384 16384
+limit nofile 32768 32768
 
 pre-start script
     set -e