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 08C4D200B45 for ; Thu, 9 Jun 2016 16:19:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 07731160A65; Thu, 9 Jun 2016 14:19:31 +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 1C046160A69 for ; Thu, 9 Jun 2016 16:19:27 +0200 (CEST) Received: (qmail 354 invoked by uid 500); 9 Jun 2016 14:19: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 98215 invoked by uid 99); 9 Jun 2016 14:19:22 -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, 09 Jun 2016 14:19:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95DEAE974B; Thu, 9 Jun 2016 14:19:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Thu, 09 Jun 2016 14:19:53 -0000 Message-Id: In-Reply-To: <2b0dc64e37f2466b9a5beb0fab583e35@git.apache.org> References: <2b0dc64e37f2466b9a5beb0fab583e35@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/94] ambari git commit: AMBARI-17112. Fixed implementation of on-ambari-upgrade support. Update all stack configuration xmls to pass validation (dlysnichenko) archived-at: Thu, 09 Jun 2016 14:19:31 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml index c595f3a..4bebc19 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml @@ -24,15 +24,13 @@ yarn_log_dir_prefix /var/log/hadoop-yarn YARN Log Dir Prefix - - + yarn_pid_dir_prefix /var/run/hadoop-yarn YARN PID Dir Prefix - - + yarn_user @@ -44,43 +42,37 @@ user false - - + yarn_heapsize 1024 Max heapsize for all YARN components using a numerical value in the scale of MB - - + resourcemanager_heapsize 1024 Max heapsize for ResourceManager using a numerical value in the scale of MB - - + nodemanager_heapsize 1024 Max heapsize for NodeManager using a numerical value in the scale of MB - - + min_user_id 1000 Set to 0 to disallow root from submitting jobs. Set to 1000 to disallow all superusers from submitting jobs - - + apptimelineserver_heapsize 1024 Max heapsize for AppTimelineServer using a numerical value in the scale of MB - - + @@ -201,7 +193,6 @@ YARN_OPTS="$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE" content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml index cece269..7299f49 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-log4j.xml @@ -67,7 +67,6 @@ log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$Appl content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml index fc6708f..cefa82a 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml @@ -23,22 +23,19 @@ yarn.resourcemanager.hostname localhost The hostname of the RM. - - + yarn.resourcemanager.resource-tracker.address localhost:8025 The address of ResourceManager. - - + yarn.resourcemanager.scheduler.address localhost:8030 The address of the scheduler interface. - - + yarn.resourcemanager.address @@ -47,22 +44,19 @@ The address of the applications manager interface in the RM. - - + yarn.resourcemanager.admin.address localhost:8141 The address of the RM admin interface. - - + yarn.resourcemanager.scheduler.class org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler The class to use as the resource scheduler. - - + yarn.scheduler.minimum-allocation-mb @@ -72,8 +66,7 @@ in MBs. Memory requests lower than this won't take effect, and the specified value will get allocated at minimum. - - + yarn.scheduler.maximum-allocation-mb @@ -83,45 +76,39 @@ in MBs. Memory requests higher than this won't take effect, and will get capped to this value. - - + yarn.acl.enable false Are acls enabled. - - + yarn.admin.acl ACL of who can be admin of the YARN cluster. - - + yarn.nodemanager.address 0.0.0.0:45454 The address of the container manager in the NM. - - + yarn.nodemanager.resource.memory-mb 5120 Amount of physical memory, in MB, that can be allocated for containers. - - + yarn.application.classpath /etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/* Classpath for typical applications. - - + yarn.nodemanager.vmem-pmem-ratio @@ -131,37 +118,32 @@ expressed in terms of physical memory, and virtual memory usage is allowed to exceed this allocation by this ratio. - - + yarn.nodemanager.container-executor.class org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor ContainerExecutor for launching containers - - + yarn.nodemanager.linux-container-executor.group hadoop Unix group of the NodeManager - - + yarn.nodemanager.aux-services mapreduce_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.mapreduce_shuffle.class org.apache.hadoop.mapred.ShuffleHandler The auxiliary service class to use - - + yarn.nodemanager.log-dirs @@ -173,8 +155,7 @@ named container_{$contid}. Each container directory will contain the files stderr, stdin, and syslog generated by that container. - - + yarn.nodemanager.local-dirs @@ -186,8 +167,7 @@ Individual containers' work directories, called container_${contid}, will be subdirectories of this. - - + yarn.nodemanager.container-monitor.interval-ms @@ -196,8 +176,7 @@ The interval, in milliseconds, for which the node manager waits between two cycles of monitoring its containers' memory usage. - - + @@ -103,7 +95,6 @@ export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_ content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml index 1f5031f..c33124f 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-log4j.xml @@ -97,7 +97,6 @@ log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@% content - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml index b06ea45..31eca9c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml @@ -22,33 +22,28 @@ fs.AbstractFileSystem.glusterfs.impl org.apache.hadoop.fs.local.GlusterFs - - + fs.glusterfs.impl org.apache.hadoop.fs.glusterfs.GlusterFileSystem - - + fs.glusterfs.volumes The name of the gluster volume(s) you would like Hadoop to use. Values should be seperated by commas i.e. gv0, gv1 gv0 - - + fs.glusterfs.volume.fuse.gv0 The mount point that corresponds to the fs.glusterfs.volumes value /mnt/gv0 - - + fs.defaultFS glusterfs:///localhost:8020 - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml index d7978c3..96b4f3f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml @@ -24,50 +24,43 @@ hadoop_pid_dir_prefix /var/run/hadoop Hadoop PID Dir Prefix - - + hadoop_heapsize 1024 Hadoop maximum Java heap size - - + glusterfs_user root - - + hdfs_log_dir_prefix /var/log/hadoop Hadoop Log Dir Prefix - - + namenode_heapsize 1024 NameNode Java heap size - - + namenode_host NameNode Host. - - + snamenode_host Secondary NameNode. - - + proxyuser_group @@ -77,16 +70,14 @@ false - - + hdfs_user

HDFS User

hdfs User to run HDFS as - - + @@ -322,8 +295,7 @@ full privileges, regardless of stored ACLs, across the cluster. Only used when HBase security is enabled. - - + hbase.security.authentication @@ -331,16 +303,14 @@ Controls whether or not secure authentication is enabled for HBase. Possible values are 'simple' (no authentication), and 'kerberos'. - - + hbase.security.authorization false Enables HBase authorization. Set the value of this property to false to disable HBase authorization. - - + hbase.coprocessor.region.classes @@ -351,8 +321,7 @@ it in HBase's classpath and add the fully qualified class name here. A coprocessor can also be loaded on demand by setting HTableDescriptor. - - + hbase.coprocessor.master.classes @@ -364,8 +333,7 @@ implementing your own MasterObserver, just put it in HBase's classpath and add the fully qualified class name here. - - + hbase.zookeeper.property.clientPort @@ -373,8 +341,7 @@ Property from ZooKeeper's config zoo.cfg. The port at which the clients will connect. - - + @@ -404,8 +370,7 @@ and will not be downgraded. ZooKeeper versions before 3.4 do not support multi-update and will not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495). - - + zookeeper.znode.parent @@ -415,21 +380,18 @@ By default, all of HBase's ZooKeeper file path are configured with a relative path, so they will all go under this directory unless changed. - - + hbase.defaults.for.version.skip true Disables version verification. - - + dfs.domain.socket.path /var/lib/hadoop-hdfs/dn_socket Path to domain socket. - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml index 3ba05ce..aed5222 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml @@ -26,22 +26,19 @@ The size of this buffer should probably be a multiple of hardware page size (4096 on Intel x86), and it determines how much data is buffered during read and write operations. - - + io.serializations org.apache.hadoop.io.serializer.WritableSerialization - - + io.compression.codecs org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec A list of the compression codec classes that can be used for compression/decompression. - - + @@ -51,8 +48,7 @@ The name of the default file system. Either the literal string "local" or a host:port for HDFS. true - - + fs.trash.interval @@ -60,8 +56,7 @@ Number of minutes between trash checkpoints. If zero, the trash feature is disabled. - - + @@ -70,8 +65,7 @@ Defines the threshold number of connections after which connections will be inspected for idleness. - - + ipc.client.connection.maxidletime @@ -79,15 +73,13 @@ The maximum time after which a client will bring down the connection to the server. - - + ipc.client.connect.max.retries 50 Defines the maximum number of retries for IPC connections. - - + @@ -98,8 +90,7 @@ not be exposed to public. Enable this option if the interfaces are only reachable by those who have the right authorization. - - + hadoop.security.authentication @@ -108,8 +99,7 @@ Set the authentication for the cluster. Valid values are: simple or kerberos. - - + hadoop.security.authorization @@ -117,8 +107,7 @@ Enable authorization for different protocols. - - + hadoop.security.auth_to_local @@ -168,7 +157,6 @@ If you want to treat all principals from APACHE.ORG with /admin as "admin", your RULE[2:$1%$2@$0](.%admin@APACHE.ORG)s/./admin/ DEFAULT - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml index 454301a..424eabb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/global.xml @@ -24,238 +24,204 @@ namenode_host NameNode Host. - - + dfs_namenode_name_dir /hadoop/hdfs/namenode NameNode Directories. - - + snamenode_host Secondary NameNode. - - + dfs_namenode_checkpoint_dir /hadoop/hdfs/namesecondary Secondary NameNode checkpoint dir. - - + datanode_hosts List of Datanode Hosts. - - + dfs_datanode_data_dir /hadoop/hdfs/data Data directories for Data Nodes. - - + hdfs_log_dir_prefix /var/log/hadoop Hadoop Log Dir Prefix - - + hadoop_pid_dir_prefix /var/run/hadoop Hadoop PID Dir Prefix - - + dfs_webhdfs_enabled true WebHDFS enabled - - + hadoop_heapsize 1024 Hadoop maximum Java heap size - - + namenode_heapsize 1024 NameNode Java heap size - - + namenode_opt_newsize 200 NameNode new generation size - - + namenode_opt_maxnewsize 200 NameNode maximum new generation size - - + namenode_opt_permsize 128 NameNode permanent generation size - - + namenode_opt_maxpermsize 256 NameNode maximum permanent generation size - - + datanode_du_reserved 1073741824 Reserved space for HDFS - - + dtnode_heapsize 1024 DataNode maximum Java heap size - - + dfs_datanode_failed_volume_tolerated 0 DataNode volumes failure toleration - - + dfs_namenode_checkpoint_period 21600 HDFS Maximum Checkpoint Delay - - + fs_checkpoint_size 0.5 FS Checkpoint Size. - - + proxyuser_group users Proxy user group. - - + dfs_exclude HDFS Exclude hosts. - - + dfs_replication 3 Default Block Replication. - - + dfs_block_local_path_access_user hbase Default Block Replication. - - + dfs_datanode_address 50010 Port for datanode address. - - + dfs_datanode_http_address 50075 Port for datanode address. - - + dfs_datanode_data_dir_perm 750 Datanode dir perms. - - + security_enabled false Hadoop Security - - + kerberos_domain EXAMPLE.COM Kerberos realm. - - + kadmin_pw Kerberos realm admin password - - + keytab_path /etc/security/keytabs Kerberos keytab path. - - + keytab_path /etc/security/keytabs KeyTab Directory. - - + namenode_formatted_mark_dir /var/run/hadoop/hdfs/namenode/formatted/ Formatteed Mark Directory. - - + hdfs_user hdfs User and Groups. - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hadoop-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hadoop-policy.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hadoop-policy.xml index c147171..9f53c8f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hadoop-policy.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hadoop-policy.xml @@ -26,8 +26,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.client.datanode.protocol.acl @@ -37,8 +36,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.datanode.protocol.acl @@ -48,8 +46,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.inter.datanode.protocol.acl @@ -59,8 +56,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.namenode.protocol.acl @@ -70,8 +66,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.inter.tracker.protocol.acl @@ -81,8 +76,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.job.client.protocol.acl @@ -92,8 +86,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.job.task.protocol.acl @@ -103,8 +96,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.admin.operations.protocol.acl @@ -113,8 +105,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.refresh.usertogroups.mappings.protocol.acl @@ -124,8 +115,7 @@ group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - + security.refresh.policy.protocol.acl @@ -135,7 +125,6 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed. - - +