Skip to content

Commit 4f653e1

Browse files
committed
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 <[email protected]>
1 parent 7a036c6 commit 4f653e1

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
fs.aio-max-nr = 2097152
2+
@sysctl_pid_max@
3+

etc/sysctl/CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
44
set(sysctl_pid_max "kernel.pid_max = 4194304")
55
endif()
66

7-
configure_file(90-ceph-osd.conf.in
8-
${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
9-
@ONLY)
7+
if(WITH_SEASTAR)
8+
configure_file(90-crimson-osd.conf.in
9+
${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
10+
@ONLY)
11+
else()
12+
configure_file(90-ceph-osd.conf.in
13+
${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
14+
@ONLY)
15+
endif()

0 commit comments

Comments
 (0)