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 63825200C1A for ; Mon, 13 Feb 2017 22:03:40 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 61CFF160B83; Mon, 13 Feb 2017 21:03:40 +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 F317F160B7F for ; Mon, 13 Feb 2017 22:03:37 +0100 (CET) Received: (qmail 51845 invoked by uid 500); 13 Feb 2017 21:03:36 -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 51367 invoked by uid 99); 13 Feb 2017 21:03:36 -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, 13 Feb 2017 21:03:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0435EE102F; Mon, 13 Feb 2017 21:03:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 13 Feb 2017 21:03:52 -0000 Message-Id: <8c6b0220937247119e049c13259ea4d7@git.apache.org> In-Reply-To: <637e6c2b9fef495081cb2600edf8b281@git.apache.org> References: <637e6c2b9fef495081cb2600edf8b281@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] ambari git commit: AMBARI-19968. Control Log Level for all Hive components for log4j (Madhuvanthi Radhakrishnan via smohanty) archived-at: Mon, 13 Feb 2017 21:03:40 -0000 AMBARI-19968. Control Log Level for all Hive components for log4j (Madhuvanthi Radhakrishnan via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6e0b267 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6e0b267 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6e0b267 Branch: refs/heads/branch-dev-patch-upgrade Commit: d6e0b267a26ee5a1ca8a35b2cf682c860653eef8 Parents: 6098d34 Author: Sumit Mohanty Authored: Fri Feb 10 22:54:27 2017 -0800 Committer: Sumit Mohanty Committed: Sat Feb 11 08:23:46 2017 -0800 ---------------------------------------------------------------------- .../ambari/server/state/theme/TabLayout.java | 17 ++- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 2 +- .../package/scripts/hive_interactive.py | 4 +- .../0.12.0.2.0/package/scripts/params_linux.py | 1 + .../HIVE/configuration/beeline-log4j2.xml | 2 +- .../services/HIVE/configuration/hive-env.xml | 29 +++++ .../HIVE/configuration/hive-exec-log4j.xml | 114 +++++++++++++++++ .../HIVE/configuration/hive-exec-log4j2.xml | 2 +- .../services/HIVE/configuration/hive-log4j.xml | 126 +++++++++++++++++++ .../services/HIVE/configuration/hive-log4j2.xml | 2 +- .../HIVE/configuration/llap-cli-log4j2.xml | 2 +- .../HIVE/configuration/llap-daemon-log4j.xml | 2 +- .../HIVE/configuration/webhcat-log4j.xml | 83 ++++++++++++ .../HDP/2.5/services/HIVE/themes/theme.json | 48 +++++++ .../stacks/2.0.6/HIVE/test_hive_client.py | 4 +- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 6 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 4 +- .../stacks/2.5/HIVE/test_hive_server_int.py | 10 +- 18 files changed, 432 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java index 0e38040..4f6cf8f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/TabLayout.java @@ -19,15 +19,16 @@ package org.apache.ambari.server.state.theme; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonSerialize; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @JsonSerialize(include= JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) @@ -90,8 +91,12 @@ public class TabLayout { if (childSection.isRemoved()) { mergedSections.remove(childSection.getName()); } else { - Section parentSection = mergedSections.get(childSection.getName()); - childSection.mergeWithParent(parentSection); + if(mergedSections.containsKey(childSection.getName())) { + Section parentSection = mergedSections.get(childSection.getName()); + childSection.mergeWithParent(parentSection); + }else{ + childSection.mergeWithParent(childSection); + } mergedSections.put(childSection.getName(), childSection); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py index 2a4fd30..b7b04a2 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py @@ -375,7 +375,7 @@ def fill_conf_dir(component_conf_dir): mode=mode_identified_for_file, group=params.user_group, owner=params.hive_user, - content=params.log4j_exec_props + content=InlineTemplate(params.log4j_exec_props) ) elif (os.path.exists("{component_conf_dir}/{log4j_exec_filename}.template")): File(format("{component_conf_dir}/{log4j_exec_filename}"), http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py index 10c2e6c..3a70fcf 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py @@ -248,14 +248,14 @@ def hive_interactive(name=None): mode=mode_identified, group=params.user_group, owner=params.hive_user, - content=params.hive_exec_log4j2) + content=InlineTemplate(params.hive_exec_log4j2)) beeline_log4j2_filename = 'beeline-log4j2.properties' File(format("{hive_server_interactive_conf_dir}/{beeline_log4j2_filename}"), mode=mode_identified, group=params.user_group, owner=params.hive_user, - content=params.beeline_log4j2) + content=InlineTemplate(params.beeline_log4j2)) File(os.path.join(hive_server_interactive_conf_dir, "hadoop-metrics2-hiveserver2.properties"), owner=params.hive_user, http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py index 936b194..a32fbfb 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py @@ -497,6 +497,7 @@ webhcat_log_maxfilesize = default("/configurations/webhcat-log4j/webhcat_log_max webhcat_log_maxbackupindex = default("/configurations/webhcat-log4j/webhcat_log_maxbackupindex", 20) hive_log_maxfilesize = default("/configurations/hive-log4j/hive_log_maxfilesize", 256) hive_log_maxbackupindex = default("/configurations/hive-log4j/hive_log_maxbackupindex", 30) +hive_log_level = default("/configurations/hive-env/hive.log.level", "INFO") #hive-log4j.properties.template if (('hive-log4j' in config['configurations']) and ('content' in config['configurations']['hive-log4j'])): http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml index efe9d6e..e814045 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml @@ -46,7 +46,7 @@ name = BeelineLog4j2 packages = org.apache.hadoop.hive.ql.log # list of properties -property.hive.log.level = WARN +property.hive.log.level = {{hive_log_level}} property.hive.root.logger = console # list of all appenders http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml index 14e58bd..ca44bf2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml @@ -20,6 +20,35 @@ */ --> + + hive.log.level + Hive Log level to control log4j - Options are INFO, DEBUG, WARN, ERROR + INFO + Hive Log Level + + value-list + + + INFO + + + + DEBUG + + + + WARN + + + + ERROR + + + + 1 + + + content http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j.xml new file mode 100644 index 0000000..4d09756 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j.xml @@ -0,0 +1,114 @@ + + + + + + content + hive-exec-log4j template + Custom hive-exec-log4j + +# 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. + +# Define some default values that can be overridden by system properties + +hive.log.threshold=ALL +hive.root.logger={{hive_log_level}},FA +hive.log.dir=${java.io.tmpdir}/${user.name} +hive.query.id=hadoop +hive.log.file=${hive.query.id}.log + +# Define the root logger to the system property "hadoop.root.logger". +log4j.rootLogger=${hive.root.logger}, EventCounter + +# Logging Threshold +log4j.threshhold=${hive.log.threshold} + +# +# File Appender +# + +log4j.appender.FA=org.apache.log4j.FileAppender +log4j.appender.FA.File=${hive.log.dir}/${hive.log.file} +log4j.appender.FA.layout=org.apache.log4j.PatternLayout + +# Pattern format: Date LogLevel LoggerName LogMessage +#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n +# Debugging Pattern format +log4j.appender.FA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n + + +# +# console +# Add "console" to rootlogger above if you want to use this +# + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.target=System.err +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n + +#custom logging levels +#log4j.logger.xxx=DEBUG + +# +# Event Counter Appender +# Sends counts of logging messages at different severity levels to Hadoop Metrics. +# +log4j.appender.EventCounter=org.apache.hadoop.hive.shims.HiveEventCounter + + +log4j.category.DataNucleus=ERROR,FA +log4j.category.Datastore=ERROR,FA +log4j.category.Datastore.Schema=ERROR,FA +log4j.category.JPOX.Datastore=ERROR,FA +log4j.category.JPOX.Plugin=ERROR,FA +log4j.category.JPOX.MetaData=ERROR,FA +log4j.category.JPOX.Query=ERROR,FA +log4j.category.JPOX.General=ERROR,FA +log4j.category.JPOX.Enhancer=ERROR,FA + + +# Silence useless ZK logs +log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,FA +log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,FA + + + + content + false + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml index 3b935f8..b96a468 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml @@ -46,7 +46,7 @@ name = HiveExecLog4j2 packages = org.apache.hadoop.hive.ql.log # list of properties -property.hive.log.level = INFO +property.hive.log.level = {{hive_log_level}} property.hive.root.logger = FA property.hive.query.id = hadoop property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name} http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j.xml new file mode 100644 index 0000000..ca0fa49 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j.xml @@ -0,0 +1,126 @@ + + + + + + content + hive-log4j template + Custom log4j.properties + +# 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. + +# Define some default values that can be overridden by system properties +hive.log.threshold=ALL +hive.root.logger={{hive_log_level}},DRFA +hive.log.dir=${java.io.tmpdir}/${user.name} +hive.log.file=hive.log + +# Define the root logger to the system property "hadoop.root.logger". +log4j.rootLogger=${hive.root.logger}, EventCounter + +# Logging Threshold +log4j.threshold=${hive.log.threshold} + +# +# Daily Rolling File Appender +# +# Use the PidDailyerRollingFileAppend class instead if you want to use separate log files +# for different CLI session. +# +# log4j.appender.DRFA=org.apache.hadoop.hive.ql.log.PidDailyRollingFileAppender + +log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender + +log4j.appender.DRFA.File=${hive.log.dir}/${hive.log.file} + +# Rollver at midnight +log4j.appender.DRFA.DatePattern=.yyyy-MM-dd + +# 30-day backup +#log4j.appender.DRFA.MaxBackupIndex= {{hive_log_maxbackupindex}} +log4j.appender.DRFA.MaxFileSize = {{hive_log_maxfilesize}}MB +log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout + + +# Pattern format: Date LogLevel LoggerName LogMessage +#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n +# Debugging Pattern format +log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n + + +# +# console +# Add "console" to rootlogger above if you want to use this +# + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.target=System.err +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n +log4j.appender.console.encoding=UTF-8 + +#custom logging levels +#log4j.logger.xxx=DEBUG + +# +# Event Counter Appender +# Sends counts of logging messages at different severity levels to Hadoop Metrics. +# +log4j.appender.EventCounter=org.apache.hadoop.hive.shims.HiveEventCounter + + +log4j.category.DataNucleus=ERROR,DRFA +log4j.category.Datastore=ERROR,DRFA +log4j.category.Datastore.Schema=ERROR,DRFA +log4j.category.JPOX.Datastore=ERROR,DRFA +log4j.category.JPOX.Plugin=ERROR,DRFA +log4j.category.JPOX.MetaData=ERROR,DRFA +log4j.category.JPOX.Query=ERROR,DRFA +log4j.category.JPOX.General=ERROR,DRFA +log4j.category.JPOX.Enhancer=ERROR,DRFA + + +# Silence useless ZK logs +log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,DRFA +log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA + + + + content + false + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml index 01d556f..e6c925d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml @@ -67,7 +67,7 @@ name = HiveLog4j2 packages = org.apache.hadoop.hive.ql.log # list of properties -property.hive.log.level = INFO +property.hive.log.level = {{hive_log_level}} property.hive.root.logger = DRFA property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name} property.hive.log.file = hive.log http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml index ff93265..a40c200 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml @@ -67,7 +67,7 @@ name = LlapCliLog4j2 packages = org.apache.hadoop.hive.ql.log # list of properties -property.hive.log.level = INFO +property.hive.log.level = {{hive_log_level}} property.hive.root.logger = console property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name} property.hive.log.file = llap-cli.log http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml index 9fe45b0..a26f7a1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml @@ -74,7 +74,7 @@ name = LlapDaemonLog4j2 packages = org.apache.hadoop.hive.ql.log # list of properties -property.llap.daemon.log.level = INFO +property.llap.daemon.log.level = {{hive_log_level}} property.llap.daemon.root.logger = console property.llap.daemon.log.dir = . property.llap.daemon.log.file = llapdaemon.log http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/webhcat-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/webhcat-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/webhcat-log4j.xml new file mode 100644 index 0000000..7295e4c --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/webhcat-log4j.xml @@ -0,0 +1,83 @@ + + + + + + content + webhcat-log4j template + Custom webhcat-log4j.properties + +# 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. + +# Define some default values that can be overridden by system properties +webhcat.root.logger = {{hive_log_level}}, standard +webhcat.log.dir = . +webhcat.log.file = webhcat.log + +log4j.rootLogger = ${webhcat.root.logger} + +# Logging Threshold +log4j.threshhold = DEBUG + +log4j.appender.standard = org.apache.log4j.DailyRollingFileAppender +log4j.appender.standard.File = ${webhcat.log.dir}/${webhcat.log.file} +log4j.appender.standard.MaxFileSize = {{webhcat_log_maxfilesize}}MB +log4j.appender.standard.MaxBackupIndex = {{webhcat_log_maxbackupindex}} + +# Rollver at midnight +log4j.appender.DRFA.DatePattern = .yyyy-MM-dd + +log4j.appender.DRFA.layout = org.apache.log4j.PatternLayout + +log4j.appender.standard.layout = org.apache.log4j.PatternLayout +log4j.appender.standard.layout.conversionPattern = %-5p | %d{DATE} | %c | %m%n + +# Class logging settings +log4j.logger.com.sun.jersey = DEBUG +log4j.logger.com.sun.jersey.spi.container.servlet.WebComponent = ERROR +log4j.logger.org.apache.hadoop = INFO +log4j.logger.org.apache.hadoop.conf = WARN +log4j.logger.org.apache.zookeeper = WARN +log4j.logger.org.eclipse.jetty = INFO + + + + content + false + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json index 9caf51e..befd313 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json @@ -1,5 +1,43 @@ { + "configuration" : { + "layouts": [ + { + "name": "default", + "tabs": [ + { + "name": "settings", + "display-name": "Settings", + "layout": { + "tab-rows": 6, + "tab-columns": 3, + "sections": [ + { + "name": "misc-settings", + "display-name": "Miscellaneous Settings", + "row-index": "2", + "column-index": "0", + "row-span": "1", + "column-span": "3", + "section-columns": "3", + "section-rows": "2", + "subsections": [ + { + "name": "misc-row1-col1", + "display-name": "Log Level", + "row-index": "0", + "column-index": "0", + "row-span": "1", + "column-span": "1" + } + ] + } + ] + } + } + ] + } + ], "placement" : { "configs" : [ { @@ -161,6 +199,10 @@ } } ] + }, + { + "config": "hive-env/hive.log.level", + "subsection-name": "misc-row1-col1" } ] }, @@ -243,6 +285,12 @@ } ] } + }, + { + "config": "hive-env/hive.log.level", + "widget": { + "type": "combo" + } } ] } http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py index d102b9d..6afc298 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py @@ -61,7 +61,7 @@ class TestHiveClient(RMFTestCase): mode = 0644, ) self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-exec-log4j.properties', - content = 'log4jproperties\nline2', + content = InlineTemplate('log4jproperties\nline2'), owner = 'hive', group = 'hadoop', mode = 0644, @@ -141,7 +141,7 @@ class TestHiveClient(RMFTestCase): mode = 0644, ) self.assertResourceCalled('File', '/usr/hdp/current/hive-client/conf/hive-exec-log4j.properties', - content = 'log4jproperties\nline2', + content = InlineTemplate('log4jproperties\nline2'), owner = 'hive', group = 'hadoop', mode = 0644, http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index 9c04acc..9486e11 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -181,7 +181,7 @@ class TestHiveMetastore(RMFTestCase): mode = 0644, ) self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties', - content = 'log4jproperties\nline2', + content = InlineTemplate('log4jproperties\nline2'), owner = 'hive', group = 'hadoop', mode = 0644, @@ -304,7 +304,7 @@ class TestHiveMetastore(RMFTestCase): mode = 0644, ) self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties', - content = 'log4jproperties\nline2', + content = InlineTemplate('log4jproperties\nline2'), owner = 'hive', group = 'hadoop', mode = 0644, @@ -449,7 +449,7 @@ class TestHiveMetastore(RMFTestCase): mode = 0644) self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties', - content = 'log4jproperties\nline2', + content = InlineTemplate('log4jproperties\nline2'), mode = 420, group = 'hadoop', owner = 'hive') http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 50164cf..6592590 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -357,7 +357,7 @@ class TestHiveServer(RMFTestCase): mode=0644 ) self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties', - content='log4jproperties\nline2', + content=InlineTemplate('log4jproperties\nline2'), owner='hive', group='hadoop', mode=0644, @@ -565,7 +565,7 @@ class TestHiveServer(RMFTestCase): mode = 0644, ) self.assertResourceCalled('File', '/usr/hdp/current/hive-server2/conf/hive-exec-log4j.properties', - content='log4jproperties\nline2', + content=InlineTemplate('log4jproperties\nline2'), owner='hive', group='hadoop', mode=0644, http://git-wip-us.apache.org/repos/asf/ambari/blob/d6e0b267/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py index 281dba4..6f017bc 100644 --- a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py +++ b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py @@ -243,7 +243,7 @@ class TestHiveServerInteractive(RMFTestCase): self.assertNoMoreResources() ''' - #restart should not call slider destroy + restart should not call slider destroy ''' @patch("os.path.isfile") @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") @@ -578,13 +578,13 @@ class TestHiveServerInteractive(RMFTestCase): mode=0600, ) self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-exec-log4j2.properties'), - content='con\ntent', # Test new line + content=InlineTemplate('con\ntent'), # Test new line owner='hive', group='hadoop', mode=0600, ) self.assertResourceCalled('File', os.path.join(conf_dir, 'beeline-log4j2.properties'), - content='con\ntent', # Test new line + content=InlineTemplate('con\ntent'), # Test new line owner='hive', group='hadoop', mode=0600, @@ -643,13 +643,13 @@ class TestHiveServerInteractive(RMFTestCase): mode=0644, ) self.assertResourceCalled('File', os.path.join(conf_dir, 'hive-exec-log4j2.properties'), - content='con\ntent', # Test new line + content=InlineTemplate('con\ntent'), # Test new line owner='hive', group='hadoop', mode=0644, ) self.assertResourceCalled('File', os.path.join(conf_dir, 'beeline-log4j2.properties'), - content='con\ntent', # Test new line + content=InlineTemplate('con\ntent'), # Test new line owner='hive', group='hadoop', mode=0644,