From a18563ffe633de82012076225aed2630faa5ebdd Mon Sep 17 00:00:00 2001 From: Guillaume Thouvenin Date: Thu, 25 Feb 2016 15:04:15 +0100 Subject: [PATCH] Increase the maximum number of file descriptors This change increases the number of file descriptors for the Heka process to 102400. By default it inherits the value from the init process that is 1024. We already hit this value and it has been demonstrated that this value is too low. Change-Id: Ib5adcfe8a8c90f21c3aed28db3b9544a3d8edb9a Closes-Bug: #1543289 (cherry picked from commit 5094fb96eaa8d17786323dec3b7efc08c2d1d49f) --- .../puppet/modules/heka/templates/hekad.upstart.conf.erb | 6 +++++- .../puppet/modules/lma_collector/files/ocf-lma_collector | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/deployment_scripts/puppet/modules/heka/templates/hekad.upstart.conf.erb b/deployment_scripts/puppet/modules/heka/templates/hekad.upstart.conf.erb index 1896827a7..601e455c8 100644 --- a/deployment_scripts/puppet/modules/heka/templates/hekad.upstart.conf.erb +++ b/deployment_scripts/puppet/modules/heka/templates/hekad.upstart.conf.erb @@ -14,4 +14,8 @@ pre-start script end script <% end -%> -exec <%= @run_as_root ? "" : "sudo -u #{ @heka_user }" %> <%= @hekad_wrapper %> 2>><%= @log_file %> +script + # https://bugs.launchpad.net/lma-toolchain/+bug/1543289 + ulimit -n 102400 + exec <%= @run_as_root ? "" : "sudo -u #{ @heka_user }" %> <%= @hekad_wrapper %> 2>><%= @log_file %> +end script diff --git a/deployment_scripts/puppet/modules/lma_collector/files/ocf-lma_collector b/deployment_scripts/puppet/modules/lma_collector/files/ocf-lma_collector index 6385aeb90..0f9cfcf29 100755 --- a/deployment_scripts/puppet/modules/lma_collector/files/ocf-lma_collector +++ b/deployment_scripts/puppet/modules/lma_collector/files/ocf-lma_collector @@ -245,6 +245,9 @@ service_start() { return "$OCF_SUCCESS" fi + # See https://bugs.launchpad.net/lma-toolchain/+bug/1543289 + ulimit -n 102400 + su "${OCF_RESKEY_user}" -s /bin/sh -c "${OCF_RESKEY_binary} \ -config=${OCF_RESKEY_config} >> $OCF_RESKEY_log_file 2>&1"' & echo $!' > "$OCF_RESKEY_pid"