http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hadoop-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hadoop-policy.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hadoop-policy.xml index 900da99..de03cdc 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hadoop-policy.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hadoop-policy.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,9 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Put site-specific property overrides in this file. --> - <configuration> <property> <name>security.client.protocol.acl</name> @@ -29,8 +26,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.client.datanode.protocol.acl</name> <value>*</value> @@ -39,8 +37,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.datanode.protocol.acl</name> <value>*</value> @@ -49,8 +48,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.inter.datanode.protocol.acl</name> <value>*</value> @@ -59,8 +59,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.namenode.protocol.acl</name> <value>*</value> @@ -69,8 +70,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.inter.tracker.protocol.acl</name> <value>*</value> @@ -79,8 +81,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.job.submission.protocol.acl</name> <value>*</value> @@ -89,8 +92,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.task.umbilical.protocol.acl</name> <value>*</value> @@ -99,36 +103,39 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> + <property> <name>security.admin.operations.protocol.acl</name> - <value></value> + <value/> <description>ACL for AdminOperationsProtocol. Used for admin commands. 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.refresh.usertogroups.mappings.protocol.acl</name> - <value></value> + <value/> <description>ACL for RefreshUserMappingsProtocol. Used to refresh users mappings. 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<property> + <property> <name>security.refresh.policy.protocol.acl</name> - <value></value> + <value/> <description>ACL for RefreshAuthorizationPolicyProtocol, used by the dfsadmin and mradmin commands to refresh the security policy in-effect. 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hdfs-site.xml index 3918bc1..1be7157 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hdfs-site.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/configuration/hdfs-site.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,63 +16,65 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Put site-specific property overrides in this file. --> - <configuration> - -<!-- file system properties --> - + <!-- file system properties --> <property> <name>dfs.name.dir</name> <!-- cluster variant --> - <value></value> + <value/> <description>Determines where on the local filesystem the DFS name node should store the name table. If this is a comma-delimited list of directories then the name table is replicated in all of the directories, for redundancy. </description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.support.append</name> - <value></value> + <value/> <description>to enable dfs append</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.webhdfs.enabled</name> - <value></value> + <value/> <description>to enable webhdfs</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> + <property> <name>dfs.datanode.socket.write.timeout</name> <value>0</value> <description>DFS Client write socket timeout</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.failed.volumes.tolerated</name> - <value></value> + <value/> <description>#of failed disks dn would tolerate</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.block.local-path-access.user</name> - <value></value> + <value/> <description>the user who is allowed to perform short circuit reads. </description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.data.dir</name> - <value></value> + <value/> <description>Determines where on the local filesystem an DFS data node should store its blocks. If this is a comma-delimited list of directories, then data will be stored in all named @@ -81,46 +82,52 @@ Directories that do not exist are ignored. </description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.hosts.exclude</name> - <value></value> + <value/> <description>Names a file that contains a list of hosts that are not permitted to connect to the namenode. The full pathname of the file must be specified. If the value is empty, no hosts are excluded.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.hosts</name> - <value></value> + <value/> <description>Names a file that contains a list of hosts that are permitted to connect to the namenode. The full pathname of the file must be specified. If the value is empty, all hosts are permitted.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.replication.max</name> <value>50</value> <description>Maximal block replication. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.replication</name> - <value></value> + <value/> <description>Default block replication. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.heartbeat.interval</name> <value>3</value> <description>Determines datanode heartbeat interval in seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.safemode.threshold.pct</name> <value>1.0f</value> @@ -130,8 +137,9 @@ Values less than or equal to 0 mean not to start in safe mode. Values greater than 1 will make safe mode permanent. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.balance.bandwidthPerSec</name> <value>6250000</value> @@ -140,269 +148,300 @@ can utilize for the balancing purpose in term of the number of bytes per second. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.address</name> - <value></value> + <value/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.http.address</name> - <value></value> + <value/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.block.size</name> <value>134217728</value> <description>The default block size for new files.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.http.address</name> - <value></value> -<description>The name of the default file system. Either the + <value/> + <description>The name of the default file system. Either the literal string "local" or a host:port for HDFS.</description> -<final>true</final> -</property> - -<property> -<name>dfs.datanode.du.reserved</name> -<!-- cluster variant --> -<value></value> -<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use. + <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.du.reserved</name> + <!-- cluster variant --> + <value/> + <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use. </description> -</property> - -<property> -<name>dfs.datanode.ipc.address</name> -<value>0.0.0.0:8010</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.ipc.address</name> + <value>0.0.0.0:8010</value> + <description> The datanode ipc server address and port. If the port is 0 then the server will start on a free port. </description> -</property> - -<property> -<name>dfs.blockreport.initialDelay</name> -<value>120</value> -<description>Delay for first block report in seconds.</description> -</property> - -<property> -<name>dfs.namenode.handler.count</name> -<value>40</value> -<description>The number of server threads for the namenode.</description> -</property> - -<property> -<name>dfs.datanode.max.xcievers</name> -<value>4096</value> -<description>PRIVATE CONFIG VARIABLE</description> -</property> - -<!-- Permissions configuration --> - -<property> -<name>dfs.umaskmode</name> -<value>077</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.blockreport.initialDelay</name> + <value>120</value> + <description>Delay for first block report in seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.namenode.handler.count</name> + <value>40</value> + <description>The number of server threads for the namenode.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.max.xcievers</name> + <value>4096</value> + <description>PRIVATE CONFIG VARIABLE</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <!-- Permissions configuration --> + <property> + <name>dfs.umaskmode</name> + <value>077</value> + <description> The octal umask used when creating files and directories. </description> -</property> - -<property> -<name>dfs.web.ugi</name> -<!-- cluster variant --> -<value>gopher,gopher</value> -<description>The user account used by the web interface. + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.web.ugi</name> + <!-- cluster variant --> + <value>gopher,gopher</value> + <description>The user account used by the web interface. Syntax: USERNAME,GROUP1,GROUP2, ... </description> -</property> - -<property> -<name>dfs.permissions</name> -<value>true</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.permissions</name> + <value>true</value> + <description> If "true", enable permission checking in HDFS. If "false", permission checking is turned off, but all other behavior is unchanged. Switching from one parameter value to the other does not change the mode, owner or group of files or directories. </description> -</property> - -<property> -<name>dfs.permissions.supergroup</name> -<value>hdfs</value> -<description>The name of the group of super-users.</description> -</property> - -<property> -<name>dfs.namenode.handler.count</name> -<value>100</value> -<description>Added to grow Queue size so that more client connections are allowed</description> -</property> - -<property> -<name>ipc.server.max.response.size</name> -<value>5242880</value> -</property> -<property> -<name>dfs.block.access.token.enable</name> -<value>true</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.permissions.supergroup</name> + <value>hdfs</value> + <description>The name of the group of super-users.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.namenode.handler.count</name> + <value>100</value> + <description>Added to grow Queue size so that more client connections are allowed</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>ipc.server.max.response.size</name> + <value>5242880</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.block.access.token.enable</name> + <value>true</value> + <description> If "true", access tokens are used as capabilities for accessing datanodes. If "false", no access tokens are checked on accessing datanodes. </description> -</property> - -<property> -<name>dfs.namenode.kerberos.principal</name> -<value></value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.namenode.kerberos.principal</name> + <value/> + <description> Kerberos principal name for the NameNode </description> -</property> - -<property> -<name>dfs.secondary.namenode.kerberos.principal</name> -<value></value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.secondary.namenode.kerberos.principal</name> + <value/> <description> Kerberos principal name for the secondary NameNode. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - -<!-- + <!-- This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned. --> <property> <name>dfs.namenode.kerberos.https.principal</name> - <value></value> - <description>The Kerberos principal for the host that the NameNode runs on.</description> - + <value/> + <description>The Kerberos principal for the host that the NameNode runs on.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.secondary.namenode.kerberos.https.principal</name> - <value></value> + <value/> <description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <!-- cluster variant --> <name>dfs.secondary.http.address</name> - <value></value> + <value/> <description>Address of secondary namenode web server</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.secondary.https.port</name> <value>50490</value> <description>The https port where secondary-namenode binds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.web.authentication.kerberos.principal</name> - <value></value> + <value/> <description> The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint. The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos HTTP SPENGO specification. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.web.authentication.kerberos.keytab</name> - <value></value> + <value/> <description> The Kerberos keytab file with the credentials for the HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.kerberos.principal</name> - <value></value> - <description> + <value/> + <description> The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.keytab.file</name> - <value></value> - <description> + <value/> + <description> Combined keytab file containing the namenode service and host principals. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.secondary.namenode.keytab.file</name> - <value></value> - <description> + <value/> + <description> Combined keytab file containing the namenode service and host principals. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.keytab.file</name> - <value></value> - <description> + <value/> + <description> The filename of the keytab file for the DataNode. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.https.port</name> <value>50470</value> - <description>The https port where namenode binds</description> - + <description>The https port where namenode binds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.https.address</name> - <value></value> - <description>The https address where namenode binds</description> - + <value/> + <description>The https address where namenode binds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.data.dir.perm</name> - <value></value> -<description>The permissions that should be there on dfs.data.dir + <value/> + <description>The permissions that should be there on dfs.data.dir directories. The datanode will not come up if the permissions are different on existing dfs.data.dir directories. If the directories don't exist, they will be created with this permission.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> - <name>dfs.access.time.precision</name> - <value>0</value> - <description>The access time for HDFS file is precise up to this value. + <name>dfs.access.time.precision</name> + <value>0</value> + <description>The access time for HDFS file is precise up to this value. The default value is 1 hour. Setting a value of 0 disables access times for HDFS. </description> -</property> - -<property> - <name>dfs.cluster.administrators</name> - <value> hdfs</value> - <description>ACL for who all can view the default servlets in the HDFS</description> -</property> - -<property> - <name>ipc.server.read.threadpool.size</name> - <value>5</value> - <description></description> -</property> - -<property> - <name>dfs.datanode.failed.volumes.tolerated</name> - <value>0</value> - <description>Number of failed disks datanode would tolerate</description> -</property> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.cluster.administrators</name> + <value> hdfs</value> + <description>ACL for who all can view the default servlets in the HDFS</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>ipc.server.read.threadpool.size</name> + <value>5</value> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.failed.volumes.tolerated</name> + <value>0</value> + <description>Number of failed disks datanode would tolerate</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/core-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/core-site.xml index 561ea6b..d01b06c 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/core-site.xml @@ -1,7 +1,6 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - - <!-- +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -17,13 +16,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Put site-specific property overrides in this file. --> - <configuration xmlns:xi="http://www.w3.org/2001/XInclude";> - -<!-- i/o properties --> - + <!-- i/o properties --> <property> <name>io.file.buffer.size</name> <value>131072</value> @@ -31,55 +26,61 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>io.serializations</name> <value>org.apache.hadoop.io.serializer.WritableSerialization</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>io.compression.codecs</name> - <value></value> + <value/> <description>A list of the compression codec classes that can be used for compression/decompression.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>io.compression.codec.lzo.class</name> <value>com.hadoop.compression.lzo.LzoCodec</value> <description>The implementation for lzo codec.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<!-- file system properties --> - + <!-- file system properties --> <property> <name>fs.default.name</name> <!-- cluster variant --> - <value></value> + <value/> <description>The name of the default file system. Either the literal string "local" or a host:port for HDFS.</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.trash.interval</name> <value>360</value> <description>Number of minutes between trash checkpoints. If zero, the trash feature is disabled. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.checkpoint.dir</name> - <value></value> + <value/> <description>Determines where on the local filesystem the DFS secondary name node should store the temporary images to merge. If this is a comma-delimited list of directories then the image is replicated in all of the directories for redundancy. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.checkpoint.edits.dir</name> <value>${fs.checkpoint.dir}</value> @@ -89,23 +90,26 @@ replicated in all of the directoires for redundancy. Default value is same as fs.checkpoint.dir </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.checkpoint.period</name> <value>21600</value> <description>The number of seconds between two periodic checkpoints. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.checkpoint.size</name> <value>536870912</value> <description>The size of the current edit log (in bytes) that triggers a periodic checkpoint even if the fs.checkpoint.period hasn't expired. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- ipc properties: copied from kryptonite configuration --> <property> <name>ipc.client.idlethreshold</name> @@ -113,22 +117,25 @@ <description>Defines the threshold number of connections after which connections will be inspected for idleness. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ipc.client.connection.maxidletime</name> <value>30000</value> <description>The maximum time after which a client will bring down the connection to the server. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>ipc.client.connect.max.retries</name> <value>50</value> <description>Defines the maximum number of retries for IPC connections.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- Web Interface Configuration --> <property> <name>webinterface.private.actions</name> @@ -138,28 +145,32 @@ not be exposed to public. Enable this option if the interfaces are only reachable by those who have the right authorization. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> - <name>hadoop.security.authentication</name> - <value></value> - <description> + <property> + <name>hadoop.security.authentication</name> + <value/> + <description> Set the authentication for the cluster. Valid values are: simple or kerberos. </description> - </property> -<property> - <name>hadoop.security.authorization</name> - <value></value> - <description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>hadoop.security.authorization</name> + <value/> + <description> Enable authorization for different protocols. </description> -</property> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> <property> <name>hadoop.security.auth_to_local</name> - <value></value> -<description>The mapping from kerberos principal names to local OS user names. + <value/> + <description>The mapping from kerberos principal names to local OS user names. So the default rule is just "DEFAULT" which takes all principals in your default domain to their first component. "[email protected]" and "omalley/[email protected]" to "omalley", if your default domain is APACHE.ORG. The translations rules have 3 sections: @@ -197,9 +208,10 @@ If you want to treat all principals from APACHE.ORG with /admin as "admin", your RULE[2:$1%$2@$0](.%[email protected])s/./admin/ DEFAULT </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<!-- + <!-- <property> <name>hadoop.proxyuser.scope.function_hdp_user("hcat_user").groups</name> <value></value> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hadoop-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hadoop-policy.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hadoop-policy.xml index 900da99..de03cdc 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hadoop-policy.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hadoop-policy.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,9 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Put site-specific property overrides in this file. --> - <configuration> <property> <name>security.client.protocol.acl</name> @@ -29,8 +26,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.client.datanode.protocol.acl</name> <value>*</value> @@ -39,8 +37,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.datanode.protocol.acl</name> <value>*</value> @@ -49,8 +48,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.inter.datanode.protocol.acl</name> <value>*</value> @@ -59,8 +59,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.namenode.protocol.acl</name> <value>*</value> @@ -69,8 +70,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.inter.tracker.protocol.acl</name> <value>*</value> @@ -79,8 +81,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.job.submission.protocol.acl</name> <value>*</value> @@ -89,8 +92,9 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.task.umbilical.protocol.acl</name> <value>*</value> @@ -99,36 +103,39 @@ 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> + <property> <name>security.admin.operations.protocol.acl</name> - <value></value> + <value/> <description>ACL for AdminOperationsProtocol. Used for admin commands. 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>security.refresh.usertogroups.mappings.protocol.acl</name> - <value></value> + <value/> <description>ACL for RefreshUserMappingsProtocol. Used to refresh users mappings. 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - -<property> + <property> <name>security.refresh.policy.protocol.acl</name> - <value></value> + <value/> <description>ACL for RefreshAuthorizationPolicyProtocol, used by the dfsadmin and mradmin commands to refresh the security policy in-effect. 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.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hdfs-site.xml index 3918bc1..1be7157 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/configuration/hdfs-site.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,63 +16,65 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Put site-specific property overrides in this file. --> - <configuration> - -<!-- file system properties --> - + <!-- file system properties --> <property> <name>dfs.name.dir</name> <!-- cluster variant --> - <value></value> + <value/> <description>Determines where on the local filesystem the DFS name node should store the name table. If this is a comma-delimited list of directories then the name table is replicated in all of the directories, for redundancy. </description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.support.append</name> - <value></value> + <value/> <description>to enable dfs append</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.webhdfs.enabled</name> - <value></value> + <value/> <description>to enable webhdfs</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> + <property> <name>dfs.datanode.socket.write.timeout</name> <value>0</value> <description>DFS Client write socket timeout</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.failed.volumes.tolerated</name> - <value></value> + <value/> <description>#of failed disks dn would tolerate</description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.block.local-path-access.user</name> - <value></value> + <value/> <description>the user who is allowed to perform short circuit reads. </description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.data.dir</name> - <value></value> + <value/> <description>Determines where on the local filesystem an DFS data node should store its blocks. If this is a comma-delimited list of directories, then data will be stored in all named @@ -81,46 +82,52 @@ Directories that do not exist are ignored. </description> <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.hosts.exclude</name> - <value></value> + <value/> <description>Names a file that contains a list of hosts that are not permitted to connect to the namenode. The full pathname of the file must be specified. If the value is empty, no hosts are excluded.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.hosts</name> - <value></value> + <value/> <description>Names a file that contains a list of hosts that are permitted to connect to the namenode. The full pathname of the file must be specified. If the value is empty, all hosts are permitted.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.replication.max</name> <value>50</value> <description>Maximal block replication. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.replication</name> - <value></value> + <value/> <description>Default block replication. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.heartbeat.interval</name> <value>3</value> <description>Determines datanode heartbeat interval in seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.safemode.threshold.pct</name> <value>1.0f</value> @@ -130,8 +137,9 @@ Values less than or equal to 0 mean not to start in safe mode. Values greater than 1 will make safe mode permanent. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.balance.bandwidthPerSec</name> <value>6250000</value> @@ -140,269 +148,300 @@ can utilize for the balancing purpose in term of the number of bytes per second. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.address</name> - <value></value> + <value/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.http.address</name> - <value></value> + <value/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.block.size</name> <value>134217728</value> <description>The default block size for new files.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.http.address</name> - <value></value> -<description>The name of the default file system. Either the + <value/> + <description>The name of the default file system. Either the literal string "local" or a host:port for HDFS.</description> -<final>true</final> -</property> - -<property> -<name>dfs.datanode.du.reserved</name> -<!-- cluster variant --> -<value></value> -<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use. + <final>true</final> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.du.reserved</name> + <!-- cluster variant --> + <value/> + <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use. </description> -</property> - -<property> -<name>dfs.datanode.ipc.address</name> -<value>0.0.0.0:8010</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.ipc.address</name> + <value>0.0.0.0:8010</value> + <description> The datanode ipc server address and port. If the port is 0 then the server will start on a free port. </description> -</property> - -<property> -<name>dfs.blockreport.initialDelay</name> -<value>120</value> -<description>Delay for first block report in seconds.</description> -</property> - -<property> -<name>dfs.namenode.handler.count</name> -<value>40</value> -<description>The number of server threads for the namenode.</description> -</property> - -<property> -<name>dfs.datanode.max.xcievers</name> -<value>4096</value> -<description>PRIVATE CONFIG VARIABLE</description> -</property> - -<!-- Permissions configuration --> - -<property> -<name>dfs.umaskmode</name> -<value>077</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.blockreport.initialDelay</name> + <value>120</value> + <description>Delay for first block report in seconds.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.namenode.handler.count</name> + <value>40</value> + <description>The number of server threads for the namenode.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.max.xcievers</name> + <value>4096</value> + <description>PRIVATE CONFIG VARIABLE</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <!-- Permissions configuration --> + <property> + <name>dfs.umaskmode</name> + <value>077</value> + <description> The octal umask used when creating files and directories. </description> -</property> - -<property> -<name>dfs.web.ugi</name> -<!-- cluster variant --> -<value>gopher,gopher</value> -<description>The user account used by the web interface. + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.web.ugi</name> + <!-- cluster variant --> + <value>gopher,gopher</value> + <description>The user account used by the web interface. Syntax: USERNAME,GROUP1,GROUP2, ... </description> -</property> - -<property> -<name>dfs.permissions</name> -<value>true</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.permissions</name> + <value>true</value> + <description> If "true", enable permission checking in HDFS. If "false", permission checking is turned off, but all other behavior is unchanged. Switching from one parameter value to the other does not change the mode, owner or group of files or directories. </description> -</property> - -<property> -<name>dfs.permissions.supergroup</name> -<value>hdfs</value> -<description>The name of the group of super-users.</description> -</property> - -<property> -<name>dfs.namenode.handler.count</name> -<value>100</value> -<description>Added to grow Queue size so that more client connections are allowed</description> -</property> - -<property> -<name>ipc.server.max.response.size</name> -<value>5242880</value> -</property> -<property> -<name>dfs.block.access.token.enable</name> -<value>true</value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.permissions.supergroup</name> + <value>hdfs</value> + <description>The name of the group of super-users.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.namenode.handler.count</name> + <value>100</value> + <description>Added to grow Queue size so that more client connections are allowed</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>ipc.server.max.response.size</name> + <value>5242880</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.block.access.token.enable</name> + <value>true</value> + <description> If "true", access tokens are used as capabilities for accessing datanodes. If "false", no access tokens are checked on accessing datanodes. </description> -</property> - -<property> -<name>dfs.namenode.kerberos.principal</name> -<value></value> -<description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.namenode.kerberos.principal</name> + <value/> + <description> Kerberos principal name for the NameNode </description> -</property> - -<property> -<name>dfs.secondary.namenode.kerberos.principal</name> -<value></value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.secondary.namenode.kerberos.principal</name> + <value/> <description> Kerberos principal name for the secondary NameNode. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - -<!-- + <!-- This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned. --> <property> <name>dfs.namenode.kerberos.https.principal</name> - <value></value> - <description>The Kerberos principal for the host that the NameNode runs on.</description> - + <value/> + <description>The Kerberos principal for the host that the NameNode runs on.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.secondary.namenode.kerberos.https.principal</name> - <value></value> + <value/> <description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <!-- cluster variant --> <name>dfs.secondary.http.address</name> - <value></value> + <value/> <description>Address of secondary namenode web server</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.secondary.https.port</name> <value>50490</value> <description>The https port where secondary-namenode binds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.web.authentication.kerberos.principal</name> - <value></value> + <value/> <description> The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint. The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos HTTP SPENGO specification. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.web.authentication.kerberos.keytab</name> - <value></value> + <value/> <description> The Kerberos keytab file with the credentials for the HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.kerberos.principal</name> - <value></value> - <description> + <value/> + <description> The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.namenode.keytab.file</name> - <value></value> - <description> + <value/> + <description> Combined keytab file containing the namenode service and host principals. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.secondary.namenode.keytab.file</name> - <value></value> - <description> + <value/> + <description> Combined keytab file containing the namenode service and host principals. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.keytab.file</name> - <value></value> - <description> + <value/> + <description> The filename of the keytab file for the DataNode. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.https.port</name> <value>50470</value> - <description>The https port where namenode binds</description> - + <description>The https port where namenode binds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.https.address</name> - <value></value> - <description>The https address where namenode binds</description> - + <value/> + <description>The https address where namenode binds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>dfs.datanode.data.dir.perm</name> - <value></value> -<description>The permissions that should be there on dfs.data.dir + <value/> + <description>The permissions that should be there on dfs.data.dir directories. The datanode will not come up if the permissions are different on existing dfs.data.dir directories. If the directories don't exist, they will be created with this permission.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> - <name>dfs.access.time.precision</name> - <value>0</value> - <description>The access time for HDFS file is precise up to this value. + <name>dfs.access.time.precision</name> + <value>0</value> + <description>The access time for HDFS file is precise up to this value. The default value is 1 hour. Setting a value of 0 disables access times for HDFS. </description> -</property> - -<property> - <name>dfs.cluster.administrators</name> - <value> hdfs</value> - <description>ACL for who all can view the default servlets in the HDFS</description> -</property> - -<property> - <name>ipc.server.read.threadpool.size</name> - <value>5</value> - <description></description> -</property> - -<property> - <name>dfs.datanode.failed.volumes.tolerated</name> - <value>0</value> - <description>Number of failed disks datanode would tolerate</description> -</property> - + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.cluster.administrators</name> + <value> hdfs</value> + <description>ACL for who all can view the default servlets in the HDFS</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>ipc.server.read.threadpool.size</name> + <value>5</value> + <description/> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> + <property> + <name>dfs.datanode.failed.volumes.tolerated</name> + <value>0</value> + <description>Number of failed disks datanode would tolerate</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/configuration/hive-site.xml index 1113ef6..91402b8 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/configuration/hive-site.xml @@ -16,117 +16,134 @@ 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. --> - <configuration> <property> <name>hive.metastore.local</name> <value>false</value> <description>controls whether to connect to remove metastore server or open a new metastore server in Hive Client JVM</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>javax.jdo.option.ConnectionURL</name> - <value></value> + <value/> <description>JDBC connect string for a JDBC metastore</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>javax.jdo.option.ConnectionDriverName</name> <value>com.mysql.jdbc.Driver</value> <description>Driver class name for a JDBC metastore</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>javax.jdo.option.ConnectionUserName</name> - <value></value> + <value/> <description>username to use against metastore database</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>javax.jdo.option.ConnectionPassword</name> - <value></value> + <value/> <description>password to use against metastore database</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.warehouse.dir</name> <value>/apps/hive/warehouse</value> <description>location of default database for the warehouse</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.sasl.enabled</name> - <value></value> + <value/> <description>If true, the metastore thrift interface will be secured with SASL. Clients must authenticate with Kerberos.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.kerberos.keytab.file</name> - <value></value> + <value/> <description>The path to the Kerberos Keytab file containing the metastore thrift server's service principal.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.kerberos.principal</name> - <value></value> + <value/> <description>The service principal for the metastore thrift server. The special string _HOST will be replaced automatically with the correct host name.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.cache.pinobjtypes</name> <value>Table,Database,Type,FieldSchema,Order</value> <description>List of comma separated metastore object types that should be pinned in the cache</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.uris</name> - <value></value> + <value/> <description>URI for client to contact metastore server</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hadoop.clientside.fs.operations</name> <value>true</value> <description>FS operations are owned by client</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.client.socket.timeout</name> <value>60</value> <description>MetaStore Client socket timeout in seconds</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.metastore.execute.setugi</name> <value>true</value> <description>In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.security.authorization.enabled</name> <value>true</value> <description>enable or disable the hive client authorization</description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.security.authorization.manager</name> <value>org.apache.hcatalog.security.HdfsAuthorizationProvider</value> <description>the hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>hive.server2.enable.doAs</name> <value>true</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>fs.hdfs.impl.disable.cache</name> <value>true</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/capacity-scheduler.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/capacity-scheduler.xml index 8034d19..17929cc 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/capacity-scheduler.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/capacity-scheduler.xml @@ -1,5 +1,4 @@ <?xml version="1.0"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -16,30 +15,29 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- This is the configuration file for the resource manager in Hadoop. --> <!-- You can configure various scheduling parameters related to queues. --> <!-- The properties for a queue follow a naming convention,such as, --> <!-- mapred.capacity-scheduler.queue.<queue-name>.property-name. --> - <configuration> - <property> <name>mapred.capacity-scheduler.maximum-system-jobs</name> <value>3000</value> <description>Maximum number of jobs in the system which can be initialized, concurrently, by the CapacityScheduler. - </description> + </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.capacity</name> <value>100</value> <description>Percentage of the number of slots in the cluster that are to be available for jobs in this queue. - </description> + </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.maximum-capacity</name> <value>-1</value> @@ -56,17 +54,19 @@ One important thing to note is that maximum-capacity is a percentage , so based on the cluster's capacity the max capacity would change. So if large no of nodes or racks get added to the cluster , max Capacity in absolute terms would increase accordingly. - </description> + </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.supports-priority</name> <value>false</value> <description>If true, priorities of jobs will be taken into account in scheduling decisions. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.minimum-user-limit-percent</name> <value>100</value> @@ -81,16 +81,18 @@ or more users, no user can use more than 25% of the queue's resources. A value of 100 implies no user limits are imposed. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.user-limit-factor</name> <value>1</value> <description>The multiple of the queue capacity which can be configured to allow a single user to acquire more slots. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks</name> <value>200000</value> @@ -98,8 +100,9 @@ which can be initialized concurrently. Once the queue's jobs exceed this limit they will be queued on disk. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.maximum-initialized-active-tasks-per-user</name> <value>100000</value> @@ -107,16 +110,18 @@ user's jobs in the queue, which can be initialized concurrently. Once the user's jobs exceed this limit they will be queued on disk. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.queue.default.init-accept-jobs-factor</name> <value>10</value> <description>The multipe of (maximum-system-jobs * queue-capacity) used to determine the number of jobs which are accepted by the scheduler. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- The default configuration settings for the capacity task scheduler --> <!-- The default values would be applied to all the queues which don't have --> <!-- the appropriate property for the particular queue --> @@ -126,25 +131,27 @@ <description>If true, priorities of jobs will be taken into account in scheduling decisions by default in a job queue. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.default-minimum-user-limit-percent</name> <value>100</value> <description>The percentage of the resources limited to a particular user for the job queue at any given point of time by default. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - - <property> <name>mapred.capacity-scheduler.default-user-limit-factor</name> <value>1</value> <description>The default multiple of queue-capacity which is used to determine the amount of slots a single user can consume concurrently. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.default-maximum-active-tasks-per-queue</name> <value>200000</value> @@ -152,8 +159,9 @@ queue, which can be initialized concurrently. Once the queue's jobs exceed this limit they will be queued on disk. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.default-maximum-active-tasks-per-user</name> <value>100000</value> @@ -161,16 +169,18 @@ the user's jobs in the queue, which can be initialized concurrently. Once the user's jobs exceed this limit they will be queued on disk. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.capacity-scheduler.default-init-accept-jobs-factor</name> <value>10</value> <description>The default multipe of (maximum-system-jobs * queue-capacity) used to determine the number of jobs which are accepted by the scheduler. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- Capacity scheduler Job Initialization configuration parameters --> <property> <name>mapred.capacity-scheduler.init-poll-interval</name> @@ -178,6 +188,8 @@ <description>The amount of time in miliseconds which is used to poll the job queues for jobs to initialize. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> <name>mapred.capacity-scheduler.init-worker-threads</name> @@ -190,6 +202,7 @@ is greater then number of threads would be equal to number of job queues. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/ed7c64ad/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/mapred-queue-acls.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/mapred-queue-acls.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/mapred-queue-acls.xml index ce12380..3f83f98 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/mapred-queue-acls.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/configuration/mapred-queue-acls.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -17,23 +16,20 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- mapred-queue-acls.xml --> <configuration> - - -<!-- queue default --> - + <!-- queue default --> <property> <name>mapred.queue.default.acl-submit-job</name> <value>*</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <property> <name>mapred.queue.default.acl-administer-jobs</name> <value>*</value> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> - <!-- END ACLs --> - </configuration>
