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 1748C200ACA for ; Thu, 9 Jun 2016 16:19:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 15F3D160A66; Thu, 9 Jun 2016 14:19:33 +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 01B8F160A62 for ; Thu, 9 Jun 2016 16:19:30 +0200 (CEST) Received: (qmail 811 invoked by uid 500); 9 Jun 2016 14:19:25 -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 98539 invoked by uid 99); 9 Jun 2016 14:19:23 -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:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A8D2E1810; Thu, 9 Jun 2016 14:19:23 +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:20:11 -0000 Message-Id: In-Reply-To: <2b0dc64e37f2466b9a5beb0fab583e35@git.apache.org> References: <2b0dc64e37f2466b9a5beb0fab583e35@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [51/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:33 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml index 6e69879..20a73d6 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/configuration/oozie-site.xml @@ -25,8 +25,7 @@ oozie.base.url http://localhost:11000/oozie Base Oozie URL. - - + oozie.system.id @@ -34,8 +33,7 @@ The Oozie system ID. - - + oozie.systemmode @@ -43,8 +41,7 @@ System mode for Oozie at startup. - - + oozie.service.AuthorizationService.security.enabled @@ -53,8 +50,7 @@ Specifies whether security (user name/admin role) is enabled or not. If disabled any user can manage Oozie system and manage any job. - - + oozie.service.PurgeService.older.than @@ -62,8 +58,7 @@ Jobs older than this value, in days, will be purged by the PurgeService. - - + oozie.service.PurgeService.purge.interval @@ -71,22 +66,19 @@ Interval at which the purge service will run, in seconds. - - + oozie.service.CallableQueueService.queue.size 1000 Max callable queue size - - + oozie.service.CallableQueueService.threads 10 Number of threads used for executing callables - - + oozie.service.CallableQueueService.callable.concurrency @@ -98,16 +90,14 @@ All commands that use action executors (action-start, action-end, action-kill and action-check) use the action type as the callable type. - - + oozie.service.coord.normal.default.timeout 120 Default timeout for a coordinator action input check (in minutes) for normal job. -1 means infinite timeout - - + oozie.db.schema.name @@ -115,8 +105,7 @@ Oozie DataBase Name - - + oozie.service.HadoopAccessorService.jobTracker.whitelist @@ -124,24 +113,21 @@ Whitelisted job tracker for Oozie service. - - + oozie.authentication.type simple - - + oozie.service.HadoopAccessorService.nameNode.whitelist - - + oozie.service.WorkflowAppService.system.libpath @@ -151,8 +137,7 @@ This path is added to workflow application if their job properties sets the property 'oozie.use.system.libpath' to true. - - + use.system.libpath.for.mapreduce.and.pig.jobs @@ -163,8 +148,7 @@ specify where the Pig JAR files are. Instead, the ones from the system library path are used. - - + oozie.authentication.kerberos.name.rules @@ -176,8 +160,7 @@ The mapping from kerberos principal names to local OS user names. - - + oozie.service.HadoopAccessorService.hadoop.configurations @@ -190,8 +173,7 @@ the Oozie configuration directory; though the path can be absolute (i.e. to point to Hadoop client conf/ directories in the local filesystem. - - + oozie.service.ActionService.executor.ext.classes @@ -202,14 +184,12 @@ org.apache.oozie.action.hadoop.SqoopActionExecutor, org.apache.oozie.action.hadoop.DistcpActionExecutor - - + oozie.service.SchemaService.wf.ext.schemas shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd,distcp-action-0.1.xsd,shell-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd,hive-action-0.3.xsd - - + oozie.service.JPAService.create.db.schema @@ -220,8 +200,7 @@ If set to true, it creates the DB schema if it does not exist. If the DB schema exists is a NOP. If set to false, it does not create the DB schema. If the DB schema does not exist it fails start up. - - + oozie.service.JPAService.jdbc.driver @@ -229,8 +208,7 @@ JDBC driver class. - - + oozie.service.JPAService.jdbc.url @@ -238,8 +216,7 @@ JDBC URL. - - + oozie.service.JPAService.jdbc.username @@ -247,8 +224,7 @@ DB user name. - - + oozie.service.JPAService.jdbc.password @@ -259,8 +235,7 @@ IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value, if empty Configuration assumes it is NULL. - - + oozie.service.JPAService.pool.max.active.conn @@ -268,7 +243,6 @@ Max number of connections. - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml index 061bfeb..db1f15d 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/capacity-scheduler.xml @@ -22,8 +22,7 @@ Maximum number of applications that can be pending and running. - - + yarn.scheduler.capacity.maximum-am-resource-percent @@ -33,8 +32,7 @@ application masters i.e. controls number of concurrent running applications. - - + yarn.scheduler.capacity.root.queues @@ -42,8 +40,7 @@ The queues at the this level (root is the root queue). - - + yarn.scheduler.capacity.root.capacity @@ -54,15 +51,13 @@ The child queues capacity should add up to their parent queue's capacity or less. - - + yarn.scheduler.capacity.root.default.capacity 100 Default queue target capacity. - - + yarn.scheduler.capacity.root.default.user-limit-factor @@ -70,8 +65,7 @@ Default queue user limit a percentage from 0.0 to 1.0. - - + yarn.scheduler.capacity.root.default.maximum-capacity @@ -79,8 +73,7 @@ The maximum capacity of the default queue. - - + yarn.scheduler.capacity.root.default.state @@ -88,8 +81,7 @@ The state of the default queue. State can be one of RUNNING or STOPPED. - - + yarn.scheduler.capacity.root.default.acl_submit_jobs @@ -97,8 +89,7 @@ The ACL of who can submit jobs to the default queue. - - + yarn.scheduler.capacity.root.default.acl_administer_jobs @@ -106,8 +97,7 @@ The ACL of who can administer jobs on the default queue. - - + yarn.scheduler.capacity.root.acl_administer_queues @@ -116,7 +106,6 @@ The ACL for who can administer this queue i.e. change sub-queue allocations. - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/global.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/global.xml index 3494d50..9739bc4 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/global.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/global.xml @@ -24,56 +24,48 @@ rm_host ResourceManager. - - + nm_hosts List of NodeManager Hosts. - - + 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 yarn YARN User - - + 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 - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml index 445bc86..3ae35e0 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml @@ -22,15 +22,13 @@ yarn.resourcemanager.resource-tracker.address localhost:8025 - - + yarn.resourcemanager.scheduler.address localhost:8030 The address of the scheduler interface. - - + yarn.resourcemanager.address @@ -39,22 +37,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 @@ -64,8 +59,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 @@ -75,43 +69,37 @@ in MBs. Memory requests higher than this won't take effect, and will get capped to this value. - - + yarn.acl.enable true - - + yarn.admin.acl * - - + yarn.nodemanager.address 0.0.0.0:45454 The address of the container manager in the NM. - - + yarn.nodemanager.resource.memory-mb 10240 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 @@ -121,35 +109,30 @@ 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 - - + yarn.nodemanager.aux-services.mapreduce.shuffle.class org.apache.hadoop.mapred.ShuffleHandler - - + yarn.nodemanager.log-dirs @@ -161,8 +144,7 @@ named container_{$contid}. Each container directory will contain the files stderr, stdin, and syslog generated by that container. - - + yarn.nodemanager.local-dirs @@ -174,8 +156,7 @@ Individual containers' work directories, called container_${contid}, will be subdirectories of this. - - + yarn.nodemanager.container-monitor.interval-ms @@ -184,8 +165,7 @@ The interval, in milliseconds, for which the node manager waits between two cycles of monitoring its containers' memory usage. - - + @@ -304,22 +279,19 @@ full privileges, regardless of stored ACLs, across the cluster. Only used when HBase security is enabled. - - + hbase.security.authentication simple - - + hbase.security.authorization false Enables HBase authorization. Set the value of this property to false to disable HBase authorization. - - + hbase.coprocessor.region.classes @@ -330,8 +302,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 @@ -343,8 +314,7 @@ implementing your own MasterObserver, just put it in HBase's classpath and add the fully qualified class name here. - - + hbase.zookeeper.property.clientPort @@ -352,8 +322,7 @@ Property from ZooKeeper's config zoo.cfg. The port at which the clients will connect. - - + @@ -383,8 +351,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 @@ -394,21 +361,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/4c5cf30e/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/configuration/core-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/configuration/core-site.xml index 5c1a617..7db4c71 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/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 - - +