Repository: ambari Updated Branches: refs/heads/branch-2.2 41f14c722 -> 61fa49bbf
AMBARI-15635. ambari is setting very small limits for kafka causing failures with too many files open error (Sriharsha Chintalapani via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61fa49bb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61fa49bb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61fa49bb Branch: refs/heads/branch-2.2 Commit: 61fa49bbf1758537906db8c9e2fee6a3da2cf95b Parents: 41f14c7 Author: Sumit Mohanty <[email protected]> Authored: Thu Apr 7 12:44:51 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Thu Apr 7 12:44:51 2016 -0700 ---------------------------------------------------------------------- .../KAFKA/0.8.1.2.2/configuration/kafka-env.xml | 4 +-- .../STORM/0.9.1.2.1/configuration/storm-env.xml | 13 +++++++- .../0.9.1.2.1/package/scripts/params_linux.py | 3 ++ .../0.9.1.2.1/package/templates/storm.conf.j2 | 35 ++++++++++++++++++++ 4 files changed, 52 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/61fa49bb/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml index 06061d8..576e648 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml @@ -54,12 +54,12 @@ </property> <property> <name>kafka_user_nofile_limit</name> - <value>32000</value> + <value>128000</value> <description>Max open files limit setting for KAFKA user.</description> </property> <property> <name>kafka_user_nproc_limit</name> - <value>16000</value> + <value>65536</value> <description>Max number of processes limit setting for KAFKA user.</description> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/61fa49bb/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml index f4f7c3c..948430f 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml @@ -85,7 +85,18 @@ <name>nimbus_principal_name</name> <description>Nimbus principal name</description> </property> - + + <property> + <name>storm_user_nofile_limit</name> + <value>128000</value> + <description>Max open files limit setting for STORM user.</description> + </property> + <property> + <name>storm_user_nproc_limit</name> + <value>65536</value> + <description>Max number of processes limit setting for STORM user.</description> + </property> + <!-- storm-env.sh --> <property> <name>content</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/61fa49bb/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py index eee1722..178ce39 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py @@ -116,6 +116,9 @@ security_enabled = config['configurations']['cluster-env']['security_enabled'] storm_ui_host = default("/clusterHostInfo/storm_ui_server_hosts", []) +storm_user_nofile_limit = default('/configurations/storm-env/storm_user_nofile_limit', 128000) +storm_user_nproc_limit = default('/configurations/storm-env/storm_user_noproc_limit', 65536) + if security_enabled: _hostname_lowercase = config['hostname'].lower() _storm_principal_name = config['configurations']['storm-env']['storm_principal_name'] http://git-wip-us.apache.org/repos/asf/ambari/blob/61fa49bb/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.conf.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.conf.j2 new file mode 100644 index 0000000..82a26fe --- /dev/null +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.conf.j2 @@ -0,0 +1,35 @@ +{# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#} + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{storm_user}} - nofile {{storm_user_nofile_limit}} +{{storm_user}} - nproc {{storm_user_nproc_limit}}
