Merge pull request ceph#60611 from Matan-B/wip-matanb-crimson-max-nr

ceph.spec.in,debian/rules: aio-max-nr for Crimson

Reviewed-by: Samuel Just <[email protected]>
Reviewed-by: Xuehan Xu <[email protected]>
Reviewed-by: Kefu Chai <[email protected]>
Reviewed-by: Yingxin Cheng <[email protected]>

Author: Matan-B

ceph.spec.in

@@ -2340,11 +2340,7 @@ fi
 if [ $1 -eq 1 ] ; then
 /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || :
 fi
-%if 0%{?sysctl_apply}
-    %sysctl_apply 90-ceph-osd.conf
-%else
-    /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || :
-%endif
+%sysctl_apply 90-ceph-osd.conf
 
 %preun osd
 %if 0%{?suse_version}

etc/sysctl/90-crimson-osd.conf.in

@@ -0,0 +1,3 @@
+fs.aio-max-nr = 2097152
+@sysctl_pid_max@
+

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