Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9A2D3200B6A for ; Mon, 22 Aug 2016 15:37:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9901E160AD4; Mon, 22 Aug 2016 13:37:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C0671160AC9 for ; Mon, 22 Aug 2016 15:36:59 +0200 (CEST) Received: (qmail 88031 invoked by uid 500); 22 Aug 2016 13:36:58 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 86963 invoked by uid 99); 22 Aug 2016 13:36:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Aug 2016 13:36:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3CEDBE08AC; Mon, 22 Aug 2016 13:36:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Date: Mon, 22 Aug 2016 13:37:06 -0000 Message-Id: In-Reply-To: <349079adae024981a7937339769ff969@git.apache.org> References: <349079adae024981a7937339769ff969@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/55] [abbrv] ambari git commit: AMBARI-18194. Hsi-Hs2: Mondrian tests intermittently fail with "java.io.IOException: Connection reset by peer" (aonishuk) archived-at: Mon, 22 Aug 2016 13:37:00 -0000 AMBARI-18194. Hsi-Hs2: Mondrian tests intermittently fail with "java.io.IOException: Connection reset by peer" (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2bc8690a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2bc8690a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2bc8690a Branch: refs/heads/branch-dev-logsearch Commit: 2bc8690a33f48b61def8278dd8abba938456e5f2 Parents: c758b7f Author: Andrew Onishuk Authored: Thu Aug 18 17:24:49 2016 +0300 Committer: Andrew Onishuk Committed: Thu Aug 18 17:24:49 2016 +0300 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 1 + .../stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2bc8690a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index 33006e1..5544085 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -98,6 +98,7 @@ mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*" # upgrades would cause these directories to have a version instead of "current" # which would cause a lot of problems when writing out hadoop-env.sh; instead # force the use of "current" in the hook +hdfs_user_nofile_limit = default("/configurations/hadoop-env/hdfs_user_nofile_limit", "128000") hadoop_home = stack_select.get_hadoop_dir("home", force_latest_on_upgrade=True) hadoop_libexec_dir = stack_select.get_hadoop_dir("libexec", force_latest_on_upgrade=True) http://git-wip-us.apache.org/repos/asf/ambari/blob/2bc8690a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml index 89c26a5..24e0193 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml @@ -147,13 +147,15 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH} export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS" -{% if is_datanode_max_locked_memory_set %} + # Fix temporary bug, when ulimit from conf files is not picked up, without full relogin. # Makes sense to fix only when runing DN as root if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then + {% if is_datanode_max_locked_memory_set %} ulimit -l {{datanode_max_locked_memory}} + {% endif %} + ulimit -n {{hdfs_user_nofile_limit}} fi -{% endif %} content