etc/sysctl: adjust fs.aio-max-nr for crimson

This will switch 90-ceph-osd.conf when compiling Crimson builds.

See 36326dc.
Clasical osd packages are adjusting the aio-max-nr value
from the default of 65536 to 1048576 as the default is too low
for some deployments. The same should be applied for Crimson's
packages.

No further changes are applied to ceph.spec.in / debuan/rules since
etc/sysctl/90-ceph-osd.conf will be installed regardless.
For rpm, we package crimson-osd with ceph-osd - this means that
the existing `%post osd` will be applied for crimson-osd packages
as well.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/etc/sysctl/90-crimson-osd.conf.in b/etc/sysctl/90-crimson-osd.conf.in
new file mode 100644 (file)
index 0000000..76910bb
--- /dev/null
+++ b/etc/sysctl/90-crimson-osd.conf.in
@@ -0,0 +1,3 @@
+fs.aio-max-nr = 2097152
+@sysctl_pid_max@
+

diff --git a/etc/sysctl/CMakeLists.txt b/etc/sysctl/CMakeLists.txt
index 682541b058e5203e83e02fb6e4da219161aaaf66..a31344c6a9c49e72f0f947790a525a9bba02ab9d 100644 (file)
--- a/etc/sysctl/CMakeLists.txt
+++ b/etc/sysctl/CMakeLists.txt
@@ -4,6 +4,12 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(sysctl_pid_max "kernel.pid_max = 4194304")
 endif()
 
-configure_file(90-ceph-osd.conf.in
-  ${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
-  @ONLY)
+if(WITH_SEASTAR)
+  configure_file(90-crimson-osd.conf.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
+    @ONLY)
+else()
+  configure_file(90-ceph-osd.conf.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
+    @ONLY)
+endif()