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 2E680200B41 for ; Thu, 2 Jun 2016 03:59:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2D32B160A6B; Thu, 2 Jun 2016 01:59:20 +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 81BDC160A62 for ; Thu, 2 Jun 2016 03:59:16 +0200 (CEST) Received: (qmail 93120 invoked by uid 500); 2 Jun 2016 01:59:12 -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 90606 invoked by uid 99); 2 Jun 2016 01:59:10 -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; Thu, 02 Jun 2016 01:59:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B9AEE383A; Thu, 2 Jun 2016 01:59:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: srimanth@apache.org To: commits@ambari.apache.org Date: Thu, 02 Jun 2016 02:00:20 -0000 Message-Id: In-Reply-To: <2a998c05c597409fbcd3db1c77f1c580@git.apache.org> References: <2a998c05c597409fbcd3db1c77f1c580@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [73/98] [abbrv] ambari git commit: Revert "AMBARI-16272. Ambari Upgrade shouldn't automatically add stack configs (dlysnichenko)" - failing testcases archived-at: Thu, 02 Jun 2016 01:59:20 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml index 579b408..5e8eae6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml @@ -16,20 +16,18 @@ See the License for the specific language governing permissions and limitations under the License. --> + - - yarn.nodemanager.aux-services - mapreduce_shuffle,spark_shuffle - Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can + + yarn.nodemanager.aux-services + mapreduce_shuffle,spark_shuffle + Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can not start with numbers - - - - - yarn.nodemanager.aux-services.spark_shuffle.class - org.apache.spark.network.yarn.YarnShuffleService - The auxiliary service class to use for Spark - - - + + + + yarn.nodemanager.aux-services.spark_shuffle.class + org.apache.spark.network.yarn.YarnShuffleService + The auxiliary service class to use for Spark + http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml index 126b3e8..0430721 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml @@ -1,4 +1,3 @@ - @@ -150,7 +129,5 @@ content - - http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml index 45d4a85..77dd386 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml @@ -1,4 +1,3 @@ - + *.shared.libs activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el - - - + + http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml index 5c8814e..d8b61e3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml @@ -19,10 +19,10 @@ */ --> + hbase.master.ui.readonly false - - - + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml index 42973d1..bfa0fd2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml @@ -19,46 +19,40 @@ */ --> + xasecure.audit.destination.db true - - + xasecure.audit.destination.db.jdbc.url true - - + xasecure.audit.destination.db.user true - - + xasecure.audit.destination.db.password true - - + xasecure.audit.destination.db.jdbc.driver true - - + xasecure.audit.credential.provider.file true - - + xasecure.audit.destination.db.batch.filespool.dir true - - - + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml index e6d0d01..2cbea00 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml @@ -20,46 +20,40 @@ */ --> + xasecure.audit.destination.db true - - + xasecure.audit.destination.db.jdbc.url true - - + xasecure.audit.destination.db.user true - - + xasecure.audit.destination.db.password true - - + xasecure.audit.destination.db.jdbc.driver true - - + xasecure.audit.credential.provider.file true - - + xasecure.audit.destination.db.batch.filespool.dir true - - - + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 8960886..1efdba6 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 @@ -21,10 +21,10 @@ --> - content - beeline-log4j template - Custom beeline-log4j2.properties - + content + beeline-log4j template + Custom beeline-log4j2.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 @@ -75,7 +75,5 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} content false - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 f9d5a5f..c48d008 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 @@ -19,7 +19,9 @@ * limitations under the License. */ --> + + content @@ -79,7 +81,6 @@ content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 ab76a5a..83f33e8 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 @@ -21,10 +21,10 @@ --> - content - hive-exec-log4j2 template - Custom hive-exec-log4j2.properties - + content + hive-exec-log4j2 template + Custom hive-exec-log4j2.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 @@ -96,7 +96,5 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} content false - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml index 88f1dc7..a6fffc0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + enable_hive_interactive @@ -40,8 +41,6 @@ 1 - - hive_server_interactive_host @@ -51,8 +50,6 @@ false - - llap_queue_capacity @@ -79,8 +76,6 @@ yarn.scheduler.capacity.root.queues - - num_llap_nodes @@ -112,8 +107,6 @@ hive.server2.tez.sessions.per.default.queue - - num_retries_for_checking_llap_status @@ -126,8 +119,6 @@ 20 1 - - llap_heap_size @@ -159,8 +150,6 @@ hive.server2.tez.sessions.per.default.queue - - slider_am_container_mb @@ -193,33 +182,26 @@ hive.server2.tez.sessions.per.default.queue - - llap_log_level INFO LLAP app logging level (WARN/INFO/DEBUG/TRACE) LLAP app logging level (WARN/INFO/DEBUG/TRACE) - - llap_app_name llap0 LLAP app name LLAP app name - - llap_java_opts -XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200 Java opts for llap application LLAP app java opts - - + content @@ -274,7 +256,6 @@ content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml index 6e40def..1ff8413 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml @@ -16,7 +16,9 @@ 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. --> + + hive.server2.thrift.port 10500 @@ -28,16 +30,14 @@ limitations under the License. false int - - + hive.server2.thrift.http.port 10501 Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'. - - + hive.server2.tez.sessions.per.default.queue 1 @@ -69,19 +69,17 @@ limitations under the License. yarn.scheduler.capacity.root.queues - - + hive.metastore.uris - + Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.

true

- - + hive.server2.enable.doAs false @@ -110,9 +108,8 @@ limitations under the License. hive_security_authorization - - + hive.prewarm.enabled @@ -133,19 +130,17 @@ limitations under the License. 1 - - + hive.tez.java.opts - + Java command line options for Tez. The -Xmx parameter value is generally 80% of hive.tez.container.size.

true

- - + hive.vectorized.execution.reduce.enabled true @@ -168,9 +163,8 @@ limitations under the License. 1 - - + hive.server2.tez.default.queues Default query queues @@ -196,9 +190,8 @@ limitations under the License. yarn.scheduler.capacity.root.queues - - + hive.server2.tez.initialize.default.sessions true @@ -222,9 +215,8 @@ limitations under the License. 1 - - + hive.driver.parallel.compilation true @@ -246,23 +238,20 @@ limitations under the License. 1 - - + hive.server2.webui.port 10502 Web UI port address - - + hive.server2.zookeeper.namespace hiveserver2-hive2 The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery. - - + hive.llap.daemon.queue.name default @@ -288,27 +277,23 @@ limitations under the License. enable_hive_interactive - - + hive.llap.daemon.yarn.shuffle.port 15551 - - + hive.execution.mode llap - - + hive.llap.execution.mode all - - + hive.llap.io.enabled true @@ -318,63 +303,53 @@ limitations under the License. hive.llap.io.memory.size - - + hive.llap.io.use.lrfu true - - + hive.llap.auto.allow.uber false - - + hive.llap.object.cache.enabled true - - + hive.tez.input.generate.consistent.splits true - - + hive.llap.client.consistent.splits true - - + hive.llap.task.scheduler.locality.delay -1 - - + hive.exec.orc.split.strategy HYBRID - - + hive.llap.daemon.service.hosts @llap0 - - + hive.llap.daemon.allow.permanent.fns false - - + hive.llap.io.memory.size In-Memory Cache per Daemon @@ -407,9 +382,8 @@ limitations under the License. hive.server2.tez.sessions.per.default.queue - - + hive.llap.daemon.num.executors Maximum CPUs per Daemon @@ -440,21 +414,18 @@ limitations under the License. hive.server2.tez.sessions.per.default.queue - - + hive.llap.daemon.memory.per.instance.mb 250 - - + hive.llap.daemon.vcpus.per.instance ${hive.llap.daemon.num.executors} - - + hive.llap.daemon.yarn.container.mb YARN Memory per Daemon @@ -487,93 +458,77 @@ limitations under the License. hive.server2.tez.sessions.per.default.queue - - + llap.shuffle.connection-keep-alive.enable true - - + llap.shuffle.connection-keep-alive.timeout 60 - - + hive.llap.io.threadpool.size 4 - - + hive.llap.daemon.rpc.port 15001 - - hive.llap.management.rpc.port 15004 - - + hive.llap.daemon.task.scheduler.enable.preemption true - - + hive.tez.exec.print.summary true - - + hive.vectorized.execution.mapjoin.native.enabled true - - + hive.vectorized.execution.mapjoin.minmax.enabled true - - + hive.vectorized.execution.mapjoin.native.fast.hashtable.enabled true - - + hive.mapjoin.hybridgrace.hashtable false - - + hive.tez.bucket.pruning true - - + hive.optimize.dynamic.partition.hashjoin true - - + hive.llap.daemon.work.dirs ${yarn.nodemanager.local-dirs} - - + hive.llap.zk.sm.connectionString localhost:2181 @@ -583,13 +538,11 @@ limitations under the License. clientPort - - + hive.llap.io.memory.mode none - - - + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 36c2261..c55b3f2 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 @@ -21,10 +21,10 @@ --> - content - hive-log4j2 template - Custom hive-log4j2.properties - + content + hive-log4j2 template + Custom hive-log4j2.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 @@ -103,7 +103,5 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} content false - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml index 97f8c26..cc310bd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml @@ -16,19 +16,19 @@ 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. --> + - - hive.metastore.schema.verification.record.version - false - Prevents metastore from overwriting the version number - - - - - hive.metastore.schema.verification - false - Prevents metastore from complaining about version difference - - - + + + hive.metastore.schema.verification.record.version + false + Prevents metastore from overwriting the version number + + + + hive.metastore.schema.verification + false + Prevents metastore from complaining about version difference + + http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml index 16e9279..fe6d174 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml @@ -16,6 +16,7 @@ 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. --> + hive.metastore.metrics.enabled @@ -23,25 +24,17 @@ limitations under the License. boolean - - hive.service.metrics.reporter JSON_FILE, JMX, HADOOP2 - - hive.service.metrics.hadoop2.component hivemetastore - - hive.service.metrics.file.location /var/log/hive/hivemetastore-report.json - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml index ad79ea5..fe4df94 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml @@ -16,32 +16,26 @@ 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. --> + + hive.metastore.metrics.enabled true boolean - - hive.service.metrics.reporter JSON_FILE, JMX, HADOOP2 - - hive.service.metrics.hadoop2.component hiveserver2 - - hive.service.metrics.file.location /var/log/hive/hiveserver2-report.json - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 5411fb3..bcacb37 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 @@ -19,12 +19,13 @@ * limitations under the License. */ --> + - content - llap-cli-log4j2 template - Custom llap-cli-log4j2.properties - + content + llap-cli-log4j2 template + Custom llap-cli-log4j2.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 @@ -104,7 +105,5 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} content false - - http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/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 6a897f4..b76454d 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 @@ -19,12 +19,13 @@ * limitations under the License. */ --> + - content - llap-deamon-log4j template - Custom llap-daemon-log4j2.properties - + content + llap-deamon-log4j template + Custom llap-daemon-log4j2.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 @@ -135,7 +136,5 @@ rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger} content false - - http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml index 42973d1..bfa0fd2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml @@ -19,46 +19,40 @@ */ --> + xasecure.audit.destination.db true - - + xasecure.audit.destination.db.jdbc.url true - - + xasecure.audit.destination.db.user true - - + xasecure.audit.destination.db.password true - - + xasecure.audit.destination.db.jdbc.driver true - - + xasecure.audit.credential.provider.file true - - + xasecure.audit.destination.db.batch.filespool.dir true - - - + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0aeaa956/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml index 8f519cc..b0eb5a6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml @@ -16,74 +16,67 @@ See the License for the specific language governing permissions and limitations under the License. --> + + tez.am.am-rm.heartbeat.interval-ms.max 250 The maximum heartbeat interval between the AM and RM in milliseconds - - + tez.am.container.idle.release-timeout-max.millis 20000 The maximum amount of time to hold on to a container if no task can be assigned to it immediately. Only active when reuse is enabled. - - + tez.am.container.idle.release-timeout-min.millis 10000 The minimum amount of time to hold on to a container that is idle. Only active when reuse is enabled. - - + tez.am.container.reuse.enabled true Configuration to specify whether container should be reused - - + tez.am.container.reuse.locality.delay-allocation-millis 250 The amount of time to wait before assigning a container to the next level of - locality. NODE -> RACK -> NON_LOCAL + locality. NODE -> RACK -> NON_LOCAL - - + tez.am.container.reuse.non-local-fallback.enabled false Whether to reuse containers for non-local tasks. Active only if reuse is enabled - - + tez.am.container.reuse.rack-fallback.enabled true Whether to reuse containers for rack local tasks. Active only if reuse is enabled - - + tez.am.launch.cluster-default.cmd-opts -server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version} Cluster default Java options for the Tez AppMaster process. These will be prepended to the properties specified via tez.am.launch.cmd-opts - - + tez.am.launch.cmd-opts -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseG1GC -XX:+ResizeTLAB Java options for the Tez AppMaster process. The Xmx value is derived based on tez.am.resource.memory.mb and is 80% of the value by default. Used only if the value is not specified explicitly by the DAG definition. - - + tez.am.launch.env LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64 @@ -92,32 +85,28 @@ you want to have access to native libraries. Used only if the value is not specified explicitly by the DAG definition. - - + tez.am.log.level INFO Root Logging level passed to the Tez app master - - + tez.am.max.app.attempts 2 Specifies the total number of time the app master will run in case recovery is triggered - - + tez.am.maxtaskfailures.per.node 10 The maximum number of allowed task attempt failures on a node before it gets marked as blacklisted - - + tez.am.resource.memory.mb 341 @@ -125,9 +114,8 @@ int - - + tez.am.tez-ui.history-url.template __HISTORY_URL_BASE__?viewPath=%2F%23%2Ftez-app%2F__APPLICATION_ID__ @@ -135,9 +123,8 @@ Template replaces __APPLICATION_ID__ with the actual applicationId and __HISTORY_URL_BASE__ with the value from the tez.tez-ui.history-url.base config property - - + tez.am.view-acls * @@ -147,55 +134,48 @@

true

- - + tez.cluster.additional.classpath.prefix /usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure - - - + + tez.counters.max 5000 The number of allowed counters for the executing DAG - - + tez.counters.max.groups 1000 The number of allowed counter groups for the executing DAG - - + tez.generate.debug.artifacts false Generate debug artifacts such as a text representation of the submitted DAG plan - - + tez.grouping.max-size 1073741824 Upper bound on the size (in bytes) of a grouped split, to avoid generating excessively large split - - + tez.grouping.min-size 16777216 Lower bound on the size (in bytes) of a grouped split, to avoid generating too many splits - - + tez.grouping.split-waves 1.7 @@ -203,18 +183,16 @@ a Vertex. 1.7 with 100% queue available implies generating a number of tasks roughly equal to 170% of the available containers on the queue - - + tez.history.logging.service.class org.apache.tez.dag.history.logging.ats.ATSV15HistoryLoggingService The class to be used for logging history data. Set to org.apache.tez.dag.history.logging.impl.SimpleHistoryLoggingService to log to the filesystem specified by ${fs.defaultFS} - - + tez.lib.uris /hdp/apps/${hdp.version}/tez_hive2/tez.tar.gz @@ -222,32 +200,28 @@ Specifying a single .tar.gz or .tgz assumes that a compressed version of the tez libs is being used. This is uncompressed into a tezlibs directory when running containers, and tezlibs/;tezlibs/lib/ are added to the classpath (after . and .*). If multiple files are specified - files are localized as regular files, contents of directories are localized as regular files (non-recursive). - - + tez.runtime.compress true Whether intermediate data should be compressed or not - - + tez.runtime.compress.codec org.apache.hadoop.io.compress.SnappyCodec The coded to be used if compressing intermediate data. Only applicable if tez.runtime.compress is enabled - - + tez.runtime.convert.user-payload.to.history-text false Whether to publish configuration information to History logger - - + tez.runtime.io.sort.mb 102 @@ -262,9 +236,8 @@ tez.runtime.sorter.class - - + tez.runtime.optimize.local.fetch true @@ -272,9 +245,8 @@ boolean - - + tez.runtime.pipelined.sorter.sort.threads 2 @@ -288,9 +260,8 @@ tez.runtime.sorter.class - - + tez.runtime.sorter.class PIPELINED @@ -309,9 +280,8 @@ 1 - - + tez.runtime.unordered.output.buffer.size-mb 19 @@ -322,26 +292,23 @@ tez.task.resource.memory.mb - - + tez.session.am.dag.submit.timeout.secs 600 Time (in seconds) for which the Tez AM should wait for a DAG to be submitted before shutting down - - + tez.session.client.timeout.secs -1 Time (in seconds) to wait for AM to come up when trying to submit a DAG from the client - - + tez.shuffle-vertex-manager.max-src-fraction 0.4 @@ -349,32 +316,28 @@ completed, all tasks on the current vertex can be scheduled. Number of tasks ready for scheduling on the current vertex scales linearly between min-fraction and max-fraction - - + tez.shuffle-vertex-manager.min-src-fraction 0.2 In case of a ScatterGather connection, the fraction of source tasks which should complete before tasks for the current vertex are schedule - - + tez.staging-dir /tmp/${user.name}/staging The staging dir used while submitting DAGs - - + tez.task.am.heartbeat.counter.interval-ms.max 4000 Time interval at which task counters are sent to the AM - - + tez.task.generate.counters.per.io true @@ -382,34 +345,30 @@ boolean - - + tez.task.get-task.sleep.interval-ms.max 200 The maximum amount of time, in seconds, to wait before a task asks an AM for another task - - + tez.task.launch.cluster-default.cmd-opts -server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version} Cluster default Java options for tasks. These will be prepended to the properties specified via tez.task.launch.cmd-opts - - + tez.task.launch.cmd-opts -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseG1GC -XX:+ResizeTLAB Java options for tasks. The Xmx value is derived based on tez.task.resource.memory.mb and is 80% of this value by default. Used only if the value is not specified explicitly by the DAG definition. - - + tez.task.launch.env LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64 @@ -418,16 +377,14 @@ you want to have access to native libraries. Used only if the value is not specified explicitly by the DAG definition. - - + tez.task.max-events-per-heartbeat 500 Maximum number of of events to fetch from the AM by the tasks in a single heartbeat. - - + tez.task.resource.memory.mb 341 @@ -444,71 +401,59 @@ yarn.scheduler.maximum-allocation-mb - - + tez.tez-ui.history-url.base http://c7001.ambari.apache.org:8080/#/main/views/TEZ/0.7.0.2.3.4.0-1310/TEZ_CLUSTER_INSTANCE Tez UI history URL - - + tez.use.cluster.hadoop-libs false This being true implies that the deployment is relying on hadoop jars being available on the cluster on all nodes. - - + tez.dag.recovery.enabled true - - tez.dag.recovery.max.unflushed.events 150000 - - tez.dag.recovery.flush.interval.secs 60 - - + tez.runtime.shuffle.parallel.copies 4 - - + tez.runtime.shuffle.keep-alive.enabled true - - + tez.am.java.opts -server -Xmx1024m -Djava.net.preferIPv4Stack=true -XX:+UseNUMA -XX:+UseParallelGC Java options for the Tez AppMaster process. The -Xmx parameter value is generally 0.8 times tez.am.resource.memory.mb config. - - + tez.am.shuffle-vertex-manager.min-src-fraction 0.2 In case of a ScatterGather connection, the fraction of source tasks which should complete before tasks for the current vertex are schedule - - + tez.am.shuffle-vertex-manager.max-src-fraction 0.4 @@ -516,9 +461,8 @@ completed, all tasks on the current vertex can be scheduled. Number of tasks ready for scheduling on the current vertex scales linearly between min-fraction and max-fraction - - + tez.am.grouping.split-waves 1.4 @@ -529,9 +473,8 @@ float - - + tez.am.grouping.min-size 16777216 @@ -541,9 +484,8 @@ int - - + tez.am.grouping.max-size 1073741824 @@ -553,9 +495,8 @@ int - - + tez.am.container.session.delay-allocation-millis 10000 @@ -564,9 +505,8 @@ it immediately. Only active when reuse is enabled. Set to -1 to never release a container in a session - - + tez.am.env LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-amd64-64 @@ -574,12 +514,13 @@ Additional execution environment entries for tez. This is not an additive property. You must preserve the original value if you want to have access to native libraries. - - + + + tez.runtime.intermediate-output.should-compress false @@ -587,18 +528,16 @@ boolean - - + tez.runtime.intermediate-output.compress.codec org.apache.hadoop.io.compress.SnappyCodec The coded to be used if compressing intermediate output. Only applicable if tez.runtime.intermediate-output.should-compress is enabled. - - + tez.runtime.intermediate-input.is-compressed false @@ -606,50 +545,42 @@ boolean - - + tez.runtime.intermediate-input.compress.codec org.apache.hadoop.io.compress.SnappyCodec The coded to be used when reading intermediate compressed input. Only applicable if tez.runtime.intermediate-input.is-compressed is enabled. - - + + tez.yarn.ats.enabled true Whether to send history events to YARN Application Timeline Server - - + + tez.runtime.report.partition.stats true - - tez.runtime.pipelined-shuffle.enabled false - - tez.runtime.pipelined.sorter.lazy-allocate.memory true - - tez.grouping.node.local.only true - - +