Revert "Always set vm.zone_reclaim_mode = 3 in kdump kernel"
Resolves: bz1896247 Upstream: fedora Conflict: none commitee160bf04d
Author: Kairui Song <kasong@redhat.com> Date: Mon Apr 19 23:00:10 2021 +0800 Revert "Always set vm.zone_reclaim_mode = 3 in kdump kernel" This reverts commit5633e83318
. vm.zone_reclaim_mode may cause trashing on some machines. And after second thought, vm.zone_reclaim_mode is barely helpful for machines with high mem stress, so just revert it. Signed-off-by: Kairui Song <kasong@redhat.com> Acked-by: Pingfan Liu <piliu@redhat.com> Signed-off-by: Kairui Song <kasong@redhat.com>
This commit is contained in:
parent
92ed977f85
commit
de11ebc0b7
@ -695,18 +695,16 @@ kdump_install_conf() {
|
|||||||
rm -f ${initdir}/tmp/$$-kdump.conf
|
rm -f ${initdir}/tmp/$$-kdump.conf
|
||||||
}
|
}
|
||||||
|
|
||||||
# Remove user custom configurations sysctl.conf & sysctl.d/*
|
# Default sysctl parameters should suffice for kdump kernel.
|
||||||
# and apply some optimization for kdump
|
# Remove custom configurations sysctl.conf & sysctl.d/*
|
||||||
overwrite_sysctl_conf() {
|
remove_sysctl_conf() {
|
||||||
|
|
||||||
# As custom configurations like vm.min_free_kbytes can lead
|
# As custom configurations like vm.min_free_kbytes can lead
|
||||||
# to OOM issues in kdump kernel, avoid them
|
# to OOM issues in kdump kernel, avoid them
|
||||||
rm -f "${initdir}/etc/sysctl.conf"
|
rm -f "${initdir}/etc/sysctl.conf"
|
||||||
rm -rf "${initdir}/etc/sysctl.d"
|
rm -rf "${initdir}/etc/sysctl.d"
|
||||||
rm -rf "${initdir}/run/sysctl.d"
|
rm -rf "${initdir}/run/sysctl.d"
|
||||||
rm -rf "${initdir}/usr/lib/sysctl.d"
|
rm -rf "${initdir}/usr/lib/sysctl.d"
|
||||||
|
|
||||||
mkdir -p "${initdir}/etc/sysctl.d"
|
|
||||||
echo "vm.zone_reclaim_mode = 3" > "${initdir}/etc/sysctl.d/99-zone-reclaim.conf"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
kdump_iscsi_get_rec_val() {
|
kdump_iscsi_get_rec_val() {
|
||||||
@ -997,7 +995,7 @@ kdump_install_systemd_conf() {
|
|||||||
install() {
|
install() {
|
||||||
kdump_module_init
|
kdump_module_init
|
||||||
kdump_install_conf
|
kdump_install_conf
|
||||||
overwrite_sysctl_conf
|
remove_sysctl_conf
|
||||||
|
|
||||||
if is_ssh_dump_target; then
|
if is_ssh_dump_target; then
|
||||||
kdump_install_random_seed
|
kdump_install_random_seed
|
||||||
|
Loading…
Reference in New Issue
Block a user