From: Samuel Just Date: Wed, 24 Jul 2013 19:26:46 +0000 (-0700) Subject: config_opts.h: increase xfs,btrfs wbthrottle defaults X-Git-Tag: v0.67-rc3~62 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f653aa570e5ebfd5ca955fafb7f500148a144bd7;p=ceph.git 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 Reviewed-by: Sage Weil Reviewed-by: Mark Nelson --- diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 7a9adf7293e99..bed4cc4c91c53 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -25,3 +25,9 @@ v0.67 copy operations. The S3 response will now return extra field under the 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 b43808e211cf2..335a92071521a 100644 --- 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 b0ed353f8e7fa..8eb02f8921438 100644 --- 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 e26bbc790b9ca..c0bf4d68c1cb1 100644 --- 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