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 B75DD200B41 for ; Thu, 2 Jun 2016 07:48:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B67D8160A51; Thu, 2 Jun 2016 05:48:27 +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 3F9AE160A50 for ; Thu, 2 Jun 2016 07:48:25 +0200 (CEST) Received: (qmail 40710 invoked by uid 500); 2 Jun 2016 05:48:24 -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 35925 invoked by uid 99); 2 Jun 2016 05:48:12 -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 05:48:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 655C6E383A; Thu, 2 Jun 2016 05:48:12 +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 05:49:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [71/98] [abbrv] ambari git commit: Revert "AMBARI-16272. Ambari Upgrade shouldn't automatically add stack configs (dlysnichenko)" - failing tests. archived-at: Thu, 02 Jun 2016 05:48:27 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml index a39cb02..dfe860e 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-env.xml @@ -19,12 +19,11 @@ * limitations under the License. */ --> + oozie_user true - - oozie_database @@ -34,8 +33,6 @@ false - - oozie_data_dir @@ -46,8 +43,6 @@ true false - - oozie_log_dir @@ -58,8 +53,6 @@ true false - - oozie_pid_dir @@ -70,9 +63,8 @@ true false - - + content @@ -147,7 +139,6 @@ set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\bin content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml index 36d544d..ab9cf3f 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/configuration/oozie-site.xml @@ -17,6 +17,7 @@ limitations under the License. --> + oozie.services @@ -100,9 +96,8 @@ org.apache.oozie.service.JobsConcurrencyService List of Oozie services - - + oozie.services.ext org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService @@ -111,7 +106,5 @@ To add/replace services defined in 'oozie.services' with custom implementations. Class names must be separated by commas. - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml index 2549a39..51d5e98 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/configuration/sqoop-env.xml @@ -19,13 +19,13 @@ * limitations under the License. */ --> + sqoop_user true - - + content @@ -71,7 +71,5 @@ content - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml index aba66e8..4572819 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-env.xml @@ -19,25 +19,22 @@ * limitations under the License. */ --> + storm_user true - - + storm_log_dir c:\hadoop\logs\storm - - storm_pid_dir c:\hadoop\run\storm - - + content @@ -45,7 +42,5 @@ content - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-site.xml index cfad1a3..060ec23 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/configuration/storm-site.xml @@ -19,17 +19,14 @@ * limitations under the License. */ --> + storm.local.dir c:\hadoop\storm - - dev.zookeeper.path c:\hadoop\temp\dev-storm-zookeeper - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml index 7f23af5..cc69edd 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-env.xml @@ -19,22 +19,20 @@ * limitations under the License. */ --> + tez_user true - - + content This is the jinja template for tez-env.cmd file - + content - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-site.xml index ae3efbe..ac788bf 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/configuration/tez-site.xml @@ -16,12 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> + + tez.staging-dir c:\hadoop\temp\${user.name}\staging The staging dir used while submitting DAGs - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml index c72e1b6..ab70aad 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-env.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + mapred_log_dir_prefix @@ -29,8 +30,6 @@ false true - - mapred_pid_dir_prefix @@ -41,15 +40,12 @@ false true - - mapred_user true - - + content @@ -59,7 +55,5 @@ content - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml index 01b04b2..332eef7 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration-mapred/mapred-site.xml @@ -5,19 +5,15 @@ mapreduce.cluster.local.dir c:\hadoop\temp\local\hadoop-mapreduce - - + mapred.local.dir c:\hadoop\temp\local\hadoop-mapreduce - - + mapred.child.tmp c:\hadoop\temp\hadoop-mapred - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml index 05efc82..38e4b92 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-env.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + yarn_log_dir_prefix @@ -29,8 +30,6 @@ false true - - yarn_pid_dir_prefix @@ -41,14 +40,10 @@ false true - - yarn_user true - - @@ -59,7 +54,5 @@ content - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml index a1e00c3..295ca80 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/configuration/yarn-site.xml @@ -1,32 +1,26 @@ - + + yarn.nodemanager.pmem-check-enabled true - - yarn.nodemanager.vmem-check-enabled true - - yarn.nodemanager.webapp.address 0.0.0.0:50060 - - + yarn.timeline-service.generic-application-history.store-class org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore Store class name for history store, defaulting to file system store - - @@ -36,15 +30,11 @@ supplied when using org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore as the value for yarn.timeline-service.generic-application-history.store-class - - yarn.timeline-service.generic-application-history.fs-history-store.compression-type none T-file compression types used to compress history data. - - yarn.timeline-service.generic-application-history.enabled @@ -55,8 +45,6 @@ Similarly, clients can redirect to the history service when applications finish if this is enabled. - - yarn.timeline-service.enabled @@ -64,31 +52,26 @@ Indicate to clients whether timeline service is enabled or not. If enabled, clients will put entities and events to the timeline server. - - + + yarn.nodemanager.local-dirs c:\hadoop\temp\local\hadoop-yarn - - + yarn.resourcemanager.webapp.https.address localhost:8088 - - + yarn.nodemanager.log-dirs c:\hadoop\logs\hadoop-yarn - - - + + yarn.timeline-service.hostname localhost - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml index 6be24cf..6c47094 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zoo.cfg.xml @@ -19,13 +19,12 @@ * limitations under the License. */ --> + dataDir c:\\\\hadoop\\\\zookeeper

ZooKeeper directory

Data directory for ZooKeeper. - - - + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml index 46b6550..220d495 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/configuration/zookeeper-env.xml @@ -19,12 +19,11 @@ * limitations under the License. */ --> + zk_user true - - zk_log_dir @@ -35,8 +34,6 @@ true false - - zk_pid_dir @@ -47,8 +44,6 @@ true false - - @@ -87,7 +82,5 @@ set JVMFLAGS=-Djava.net.preferIPv4Stack=true content - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/FALCON/configuration/falcon-startup.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/FALCON/configuration/falcon-startup.properties.xml index 982fea8..1e0659f 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/FALCON/configuration/falcon-startup.properties.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/FALCON/configuration/falcon-startup.properties.xml @@ -1,4 +1,3 @@ - + *.journal.impl org.apache.falcon.transaction.SharedFileSystemJournal Journal implementation class - - *.application.services @@ -38,15 +36,11 @@ org.apache.falcon.service.LogCleanupService Falcon Services - - prism.application.services org.apache.falcon.entity.store.ConfigurationStore Prism Services - - prism.configstore.listeners @@ -55,90 +49,68 @@ org.apache.falcon.group.FeedGroupMap Prism Configuration Store Change listeners - - - - - + + + *.falcon.security.authorization.enabled false Authorization Enabled flag - - *.falcon.enableTLS false Falcon TLS Enabled flag - - *.falcon.security.authorization.superusergroup falcon The name of the group of super-users - - *.falcon.security.authorization.admin.users falcon,ambari-qa Admin Users, comma separated users - - *.falcon.security.authorization.admin.groups falcon Admin Group Membership, comma separated users - - *.falcon.security.authorization.provider org.apache.falcon.security.DefaultAuthorizationProvider Authorization Provider Implementation Fully Qualified Class Name - - + *.falcon.graph.blueprints.graph com.thinkaurelius.titan.core.TitanFactory - - - + *.falcon.graph.storage.directory c:\hadoop\falcon\data\lineage\graphdb - - - + *.falcon.graph.storage.backend berkeleyje - - - + *.falcon.graph.serialize.path c:\hadoop\falcon\data\lineage - - - + *.falcon.graph.preserve.history false - - - + + http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml index 61ac8b7..b29bb0b 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-env.xml @@ -19,16 +19,15 @@ * limitations under the License. */ --> + hbase_max_direct_memory_size - + If not empty, adds '-XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m' to HBASE_REGIONSERVER_OPTS.

HBase off-heap MaxDirectMemorySize

true

- - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml index c77ebc9..fd157be 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HBASE/configuration/hbase-site.xml @@ -27,9 +27,8 @@ The number of times the region flush operation will be retried. - - + hbase.hregion.majorcompaction 604800000 @@ -49,8 +48,6 @@ 2592000000 milliseconds - - hbase.hregion.majorcompaction.jitter @@ -59,12 +56,11 @@ a given amount of time either side of hbase.hregion.majorcompaction. The smaller the number, the closer the compactions will happen to the hbase.hregion.majorcompaction interval. - - hbase.hregion.memstore.block.multiplier 4 + HBase Region Block Multiplier Block updates if memstore has hbase.hregion.memstore.block.multiplier times hbase.hregion.memstore.flush.size bytes. Useful preventing @@ -89,39 +85,31 @@ 1 - - hbase.bucketcache.ioengine - + Where to store the contents of the bucketcache. One of: onheap, offheap, or file. If a file, set it to file:PATH_TO_FILE.

true

- - hbase.bucketcache.size - + The size of the buckets for the bucketcache if you only use a single size.

true

- - hbase.bucketcache.percentage.in.combinedcache - + Value to be set between 0.0 and 1.0

true

- - hbase.regionserver.global.memstore.size @@ -131,8 +119,6 @@ Updates are blocked and flushes are forced until size of all memstores in a region server hits hbase.regionserver.global.memstore.size.lower.limit. - - hbase.hstore.compaction.max @@ -173,8 +159,6 @@ - - hbase.regionserver.global.memstore.size @@ -191,7 +175,5 @@ 0.8 0.01 - - http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/core-site.xml index 70bb9be..ece7835 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/core-site.xml @@ -1,6 +1,7 @@ - + - + + + hadoop.http.authentication.simple.anonymous.allowed true - - - + + http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml index 80fd857..ced0ebb 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hadoop-env.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> + @@ -125,7 +126,6 @@ set HADOOP_NAMENODE_OPTS=-Xloggc:%HADOOP_LOG_DIR%/gc-namenode.log -verbose:gc -X content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml index ee15fa2..70558da 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-log4j.xml @@ -19,7 +19,9 @@ * limitations under the License. */ --> + + content Custom log4j.properties @@ -219,7 +221,6 @@ log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN content false - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml index 1fd4fd0..de4664a 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml @@ -1,5 +1,6 @@ + + + + dfs.namenode.startup.delay.block.deletion.sec 3600 - - - + + http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml index 5dfb344..8dde3fd 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-env.xml @@ -19,24 +19,23 @@ * limitations under the License. */ --> + hive.client.heapsize true - - + content This is the jinja template for hive-env.sh file - + content - - + hive_exec_orc_storage_strategy ORC Storage Strategy @@ -55,9 +54,8 @@ 1 - - + hive_txn_acid ACID Transactions @@ -76,9 +74,8 @@ 1 - - + hive_security_authorization Choose Authorization @@ -100,9 +97,8 @@ - - + hive_timeline_logging_enabled Use ATS Logging @@ -121,7 +117,6 @@ 1 - - - + + \ No newline at end of file