Merge pull request #71584 from maralorn/master

nixos/redis: Disable hugepages for redis via sysctl and not via a systemd-oneshot
This commit is contained in:
Florian Klink 2019-10-21 23:15:30 +02:00 committed by GitHub
commit f4725b30ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -186,9 +186,9 @@ in
config = mkIf config.services.redis.enable {
boot.kernel.sysctl = mkIf cfg.vmOverCommit {
"vm.overcommit_memory" = "1";
};
boot.kernel.sysctl = {
"vm.nr_hugepages" = "0";
} // mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; };
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
@ -198,14 +198,6 @@ in
environment.systemPackages = [ cfg.package ];
systemd.services.disable-transparent-huge-pages = {
description = "Disable Transparent Huge Pages (required by Redis)";
before = [ "redis.service" ];
wantedBy = [ "redis.service" ];
script = "echo never > /sys/kernel/mm/transparent_hugepage/enabled";
serviceConfig.Type = "oneshot";
};
systemd.services.redis =
{ description = "Redis Server";