You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/06/09 15:02:01 UTC
[36/70] ambari git commit: AMBARI-17112. Fixed implementation of
on-ambari-upgrade support. Update all stack configuration xmls to pass
validation. Change defaults (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/configuration/hive-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/configuration/hive-site.xml
index c706178..d56bfab 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/configuration/hive-site.xml
@@ -21,163 +21,163 @@ limitations under the License.
<name>ambari.hive.db.schema.name</name>
<value>hive</value>
<description>Database name used as the Hive Metastore</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc</value>
<description>JDBC connect string for a JDBC metastore</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>javax.jdo.option.ConnectionUserName</name>
<value>hive</value>
<description>username to use against metastore database</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>javax.jdo.option.ConnectionPassword</name>
<value> </value>
<description>password to use against metastore database</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.sasl.enabled</name>
<value/>
<description>If true, the metastore thrift interface will be secured with SASL.
Clients must authenticate with Kerberos.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value/>
<description>The path to the Kerberos Keytab file containing the metastore
thrift server's service principal.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.kerberos.principal</name>
<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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
<description>URI for client to contact metastore server</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.metastore.client.socket.timeout</name>
<value>60</value>
<description>MetaStore Client socket timeout in seconds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.authorization.enabled</name>
<value>false</value>
<description>enable or disable the hive client authorization</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.authorization.manager</name>
<value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.metastore.authorization.manager</name>
<value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value>
<description>The authorization manager class name to be used in the metastore for authorization. The user-defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider. </description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.security.authenticator.manager</name>
<value>org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator</value>
<description>Hive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. </description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.server2.enable.doAs</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.hdfs.impl.disable.cache</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs.file.impl.disable.cache</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.enforce.bucketing</name>
<value>true</value>
<description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.enforce.sorting</name>
<value>true</value>
<description>Whether sorting is enforced. If true, while inserting into the table, sorting is enforced.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.map.aggr</name>
<value>true</value>
<description>Whether to use map-side aggregation in Hive Group By queries.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.bucketmapjoin</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.bucketmapjoin.sortedmerge</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.mapred.reduce.tasks.speculative.execution</name>
<value>false</value>
<description>Whether speculative execution for reducers should be turned on.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.join</name>
<value>true</value>
<description>Whether Hive enable the optimization about converting common
join into mapjoin based on the input file size.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.sortmerge.join</name>
@@ -185,12 +185,12 @@ limitations under the License.
<description>Will the join be automatically converted to a sort-merge join, if the joined tables pass
the criteria for sort-merge join.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.sortmerge.join.noconditionaltask</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.join.noconditionaltask</name>
@@ -199,7 +199,7 @@ limitations under the License.
size. If this paramater is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than the
specified size, the join is directly converted to a mapjoin (there is no conditional task).
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.auto.convert.join.noconditionaltask.size</name>
@@ -208,7 +208,7 @@ limitations under the License.
is on, and the sum of size for n-1 of the tables/partitions for a n-way join is smaller than this size, the join is directly
converted to a mapjoin(there is no conditional task). The default is 10MB.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.reducededuplication.min.reducer</name>
@@ -217,7 +217,7 @@ limitations under the License.
That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR.
The optimization will be disabled if number of reducers is less than specified value.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.mapjoin.mapreduce</name>
@@ -227,7 +227,7 @@ limitations under the License.
job (for e.g a group by), each map-only job is merged with the following
map-reduce job.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.mapjoin.bucket.cache.size</name>
@@ -236,17 +236,17 @@ limitations under the License.
Size per reducer.The default is 1G, i.e if the input size is 10G, it
will use 10 reducers.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.vectorized.execution.enabled</name>
<value>false</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.reducededuplication</name>
<value>true</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hive.optimize.index.filter</name>
@@ -254,6 +254,6 @@ limitations under the License.
<description>
Whether to enable automatic use of indexes
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/configuration/yarn-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/configuration/yarn-site.xml
index 1125dfd..d68478f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/YARN/configuration/yarn-site.xml
@@ -23,14 +23,14 @@
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>localhost:8025</value>
<deleted>true</deleted>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.scheduler.address</name>
<value>localhost:8030</value>
<description>The address of the scheduler interface.</description>
<deleted>true</deleted>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.address</name>
@@ -39,18 +39,18 @@
The address of the applications manager interface in the
RM.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.resourcemanager.admin.address</name>
<value/>
<description>The address of the RM admin interface.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>new-yarn-property</name>
<value>some-value</value>
<description>some description.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HBASE/configuration/hbase-site.xml
index c7b8aab..3b1bde6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HBASE/configuration/hbase-site.xml
@@ -32,7 +32,7 @@
into /tmp. Change this configuration else all data will be lost
on machine restart.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -42,7 +42,7 @@
false, startup will run all HBase and ZooKeeper daemons together
in the one JVM.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -52,26 +52,26 @@
than '/tmp' (The '/tmp' directory is often cleared on
machine restart).
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.bindAddress</name>
<value/>
<description>The bind address for the HBase Master web UI
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.port</name>
<value/>
<description>The port for the HBase Master web UI.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
<value/>
<description>The port for the HBase RegionServer web UI.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -79,7 +79,7 @@
<description>Maximum size of all memstores in a region server before new
updates are blocked and flushes are forced. Defaults to 40% of heap
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -88,7 +88,7 @@
Same property is used by the Master for count of master handlers.
Default is 10.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.majorcompaction</name>
@@ -97,7 +97,7 @@
HStoreFiles in a region. Default: 1 day.
Set to 0 to disable automated major compactions.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.lowerLimit</name>
@@ -108,7 +108,7 @@
the minimum possible flushing to occur when updates are blocked due to
memstore limiting.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
@@ -120,7 +120,7 @@
resultant flush files take a long time to compact or split, or
worse, we OOME
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.flush.size</name>
@@ -130,7 +130,7 @@
exceeds this number of bytes. Value is checked by a thread that runs
every hbase.server.thread.wakefrequency.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.memstore.mslab.enabled</name>
@@ -141,7 +141,7 @@
heavy write loads. This can reduce the frequency of stop-the-world
GC pauses on large heaps.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -151,7 +151,7 @@
grown to exceed this value, the hosting HRegion is split in two.
Default: 1G.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.scanner.caching</name>
@@ -163,7 +163,7 @@
Do not set this value such that the time between invocations is greater
than the scanner timeout; i.e. hbase.regionserver.lease.period
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.session.timeout</name>
@@ -175,7 +175,7 @@
"The client sends a requested timeout, the server responds with the
timeout that it can give the client. " In milliseconds.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.keyvalue.maxsize</name>
@@ -187,7 +187,7 @@
to set this to a fraction of the maximum region size. Setting it to zero
or less disables the check.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.compactionThreshold</name>
@@ -198,7 +198,7 @@
is run to rewrite all HStoreFiles files as one. Larger numbers
put off compaction but when it runs, it takes longer to complete.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.flush.retries.number</name>
@@ -206,7 +206,7 @@
<description>
The number of times the region flush operation will be retried.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hstore.blockingStoreFiles</name>
@@ -217,7 +217,7 @@
blocked for this HRegion until a compaction is completed, or
until hbase.hstore.blockingWaitTime has been exceeded.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hfile.block.cache.size</name>
@@ -227,7 +227,7 @@
used by HFile/StoreFile. Default of 0.25 means allocate 25%.
Set to 0 to disable but it's not recommended.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- The following properties configure authentication information for
HBase processes when using Kerberos security. There are no default
@@ -238,7 +238,7 @@
<description>Full path to the kerberos keytab file to use for logging in
the configured HMaster server principal.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.kerberos.principal</name>
@@ -249,7 +249,7 @@
portion, it will be replaced with the actual hostname of the running
instance.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.keytab.file</name>
@@ -257,7 +257,7 @@
<description>Full path to the kerberos keytab file to use for logging in
the configured HRegionServer server principal.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.kerberos.principal</name>
@@ -269,7 +269,7 @@
running instance. An entry for this principal must exist in the file
specified in hbase.regionserver.keytab.file
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Additional configuration specific to HBase security -->
<property>
@@ -279,19 +279,19 @@
full privileges, regardless of stored ACLs, across the cluster.
Only used when HBase security is enabled.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.security.authentication</name>
<value>simple</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.security.authorization</name>
<value>false</value>
<description>Enables HBase authorization. Set the value of this property to false to disable HBase authorization.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.coprocessor.region.classes</name>
@@ -302,7 +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.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.coprocessor.master.classes</name>
@@ -314,7 +314,7 @@
implementing your own MasterObserver, just put it in HBase's classpath
and add the fully qualified class name here.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -322,7 +322,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
The following three properties are used together to create the list of
@@ -338,7 +338,7 @@
list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in hbase-env.sh
this is the list of servers which we will start/stop ZooKeeper on.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- End of properties used to generate ZooKeeper host:port quorum list. -->
<property>
@@ -351,7 +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).
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>zookeeper.znode.parent</name>
@@ -361,18 +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.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.defaults.for.version.skip</name>
<value>true</value>
<description>Disables version verification.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.domain.socket.path</name>
<value>/var/lib/hadoop-hdfs/dn_socket</value>
<description>Path to domain socket.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
index 44af332..6e736ff 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/configuration/hdfs-site.xml
@@ -23,7 +23,7 @@
<description>Determines where on the local filesystem the DFS name node
should store the name table.</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.support.append</name>
@@ -31,12 +31,12 @@
<description>to enable dfs append</description>
<final>true</final>
<deleted>false</deleted>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.webhdfs.enabled</name>
<value>true</value>
<description>to enable webhdfs</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml
index a5c9665..bc95215 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/PIG/configuration/pig-properties.xml
@@ -87,6 +87,6 @@ hcat.bin=/usr/bin/hcat
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
index 44af332..6e736ff 100644
--- a/ambari-server/src/test/resources/stacks/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/stacks/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
@@ -23,7 +23,7 @@
<description>Determines where on the local filesystem the DFS name node
should store the name table.</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.support.append</name>
@@ -31,12 +31,12 @@
<description>to enable dfs append</description>
<final>true</final>
<deleted>false</deleted>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.webhdfs.enabled</name>
<value>true</value>
<description>to enable webhdfs</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/global.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/global.xml
index 2c0aeca..0ff88b5 100644
--- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/global.xml
+++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/global.xml
@@ -24,144 +24,144 @@
<name>namenode_host</name>
<value/>
<description>NameNode Host.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs_name_dir</name>
<value>/hadoop/hdfs/namenode</value>
<description>NameNode Directories.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>snamenode_host</name>
<value/>
<description>Secondary NameNode.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs_checkpoint_dir</name>
<value>/hadoop/hdfs/namesecondary</value>
<description>Secondary NameNode checkpoint dir.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>datanode_hosts</name>
<value/>
<description>List of Datanode Hosts.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs_data_dir</name>
<value>/hadoop/hdfs/data</value>
<description>Data directories for Data Nodes.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hdfs_log_dir_prefix</name>
<value>/var/log/hadoop</value>
<description>Hadoop Log Dir Prefix</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop_pid_dir_prefix</name>
<value>/var/run/hadoop</value>
<description>Hadoop PID Dir Prefix</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs_webhdfs_enabled</name>
<value>true</value>
<description>WebHDFS enabled</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop_heapsize</name>
<value>1024</value>
<description>Hadoop maximum Java heap size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_heapsize</name>
<value>1024</value>
<description>NameNode Java heap size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_newsize</name>
<value>200</value>
<description>Default size of Java new generation for NameNode (Java option -XX:NewSize) Note: The value of NameNode new generation size (default size of Java new generation for NameNode (Java option -XX:NewSize)) should be 1/8 of maximum heap size (-Xmx). Ensure that the value of the namenode_opt_newsize property is 1/8 the value of maximum heap size (-Xmx).</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_maxnewsize</name>
<value>640</value>
<description>NameNode maximum new generation size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_permsize</name>
<value>128</value>
<description>NameNode permanent generation size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_maxpermsize</name>
<value>256</value>
<description>NameNode maximum permanent generation size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>datanode_du_reserved</name>
<value>1</value>
<description>Reserved space for HDFS</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dtnode_heapsize</name>
<value>1024</value>
<description>DataNode maximum Java heap size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs_datanode_failed_volume_tolerated</name>
<value>0</value>
<description>DataNode volumes failure toleration</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs_checkpoint_period</name>
<value>21600</value>
<description>HDFS Maximum Checkpoint Delay</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>fs_checkpoint_size</name>
<value>0.5</value>
<description>FS Checkpoint Size.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security_enabled</name>
<value>false</value>
<description>Hadoop Security</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kerberos_domain</name>
<value>EXAMPLE.COM</value>
<description>Kerberos realm.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kerberos_domain</name>
<value>EXAMPLE.COM</value>
<description>Kerberos realm.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>keytab_path</name>
<value>/etc/security/keytabs</value>
<description>KeyTab Directory.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
index d5fa858..b8b5f8c 100644
--- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
@@ -24,55 +24,55 @@
<name>hdfs_log_dir_prefix</name>
<value>/var/log/hadoop</value>
<description>Hadoop Log Dir Prefix</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop_pid_dir_prefix</name>
<value>/var/run/hadoop</value>
<description>Hadoop PID Dir Prefix</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop_heapsize</name>
<value>1024</value>
<description>Hadoop maximum Java heap size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_heapsize</name>
<value>1024</value>
<description>NameNode Java heap size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_newsize</name>
<value>200</value>
<description>Default size of Java new generation for NameNode (Java option -XX:NewSize) Note: The value of NameNode new generation size (default size of Java new generation for NameNode (Java option -XX:NewSize)) should be 1/8 of maximum heap size (-Xmx). Ensure that the value of the namenode_opt_newsize property is 1/8 the value of maximum heap size (-Xmx).</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_maxnewsize</name>
<value>200</value>
<description>NameNode maximum new generation size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_permsize</name>
<value>128</value>
<description>NameNode permanent generation size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>namenode_opt_maxpermsize</name>
<value>256</value>
<description>NameNode maximum permanent generation size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dtnode_heapsize</name>
<value>1024</value>
<description>DataNode maximum Java heap size</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>proxyuser_group</name>
@@ -82,45 +82,45 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>security_enabled</name>
<value>false</value>
<description>Hadoop Security</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>kerberos_domain</name>
<value>EXAMPLE.COM</value>
<description>Kerberos realm.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hdfs_user</name>
<value>hdfs</value>
<description>User and Groups.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ignore_groupsusers_create</name>
<value>false</value>
<description>Whether to ignores failures on users and group creation</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>smokeuser</name>
<display-name>Smoke User</display-name>
<value>ambari-qa</value>
<description>User executing service checks</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>user_group</name>
<display-name>Hadoop Group</display-name>
<value>hadoop</value>
<description>Proxy user group.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- hadoop-env.sh -->
<property>
@@ -241,6 +241,6 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}:/usr/lib/hadoop/lib/native/Linux-a
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hbase-site.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hbase-site.xml
index afe544c..1d56933 100644
--- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hbase-site.xml
+++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hbase-site.xml
@@ -29,14 +29,14 @@
in milliseconds. Default is 15. Set this value low if you want unit
tests to be responsive.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.client.pause</name>
<value>5000</value>
<description>General client pause value. Used mostly as value to wait
before running a retry of a failed get, region lookup, etc.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.meta.thread.rescanfrequency</name>
@@ -44,7 +44,7 @@
<description>How long the HMaster sleeps (in milliseconds) between scans of
the root and meta tables.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.server.thread.wakefrequency</name>
@@ -52,7 +52,7 @@
<description>Time to sleep in between searches for work (in milliseconds).
Used as sleep interval by service threads such as META scanner and log roller.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -61,7 +61,7 @@
Same property is used by the HMaster for count of master handlers.
Default is 10.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.lease.period</name>
@@ -71,7 +71,7 @@
value has been reduced so that the master will notice a dead region server
sooner. The default is 30 seconds.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.info.port</name>
@@ -79,7 +79,7 @@
<description>The port for the hbase master web UI
Set to -1 if you do not want the info server to run.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
@@ -87,7 +87,7 @@
<description>The port for the hbase regionserver web UI
Set to -1 if you do not want the info server to run.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.info.port.auto</name>
@@ -96,7 +96,7 @@
search if hbase.regionserver.info.port is already in use.
Enabled for testing to run multiple tests on one machine.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.master.lease.thread.wakefrequency</name>
@@ -105,7 +105,7 @@
This value has been reduced due to the other reduced values above so that
the master will notice a dead region server sooner. The default is 15 seconds.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.optionalcacheflushinterval</name>
@@ -114,7 +114,7 @@
Amount of time to wait since the last time a region was flushed before
invoking an optional cache flush. Default 60,000.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.regionserver.safemode</name>
@@ -123,7 +123,7 @@
Turn on/off safe mode in region server. Always on for production, always off
for tests.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -134,12 +134,12 @@
Keep the maximum filesize small so we split more often in tests.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hadoop.log.dir</name>
<value>${user.dir}/../logs</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -147,6 +147,6 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml
index 160e2b3..1227d69 100644
--- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml
+++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-log4j.xml
@@ -195,6 +195,6 @@ log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-site.xml
index 6f96077..34960a9 100644
--- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hdfs-site.xml
@@ -28,28 +28,28 @@
of directories then the name table is replicated in all of the
directories, for redundancy. </description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.support.append</name>
<value>true</value>
<description>to enable dfs append</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.webhdfs.enabled</name>
<value>false</value>
<description>to enable webhdfs</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.failed.volumes.tolerated</name>
<value>0</value>
<description>#of failed disks dn would tolerate</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.local-path-access.user</name>
@@ -58,7 +58,7 @@
circuit reads.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.data.dir</name>
@@ -70,7 +70,7 @@
Directories that do not exist are ignored.
</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts.exclude</name>
@@ -79,7 +79,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.hosts</name>
@@ -88,27 +88,27 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.replication</name>
<value>3</value>
<description>Default block replication.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.heartbeat.interval</name>
<value>3</value>
<description>Determines datanode heartbeat interval in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.safemode.threshold.pct</name>
@@ -119,7 +119,7 @@
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.balance.bandwidthPerSec</name>
@@ -129,23 +129,23 @@
can utilize for the balancing purpose in term of
the number of bytes per second.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.address</name>
<value>0.0.0.0:50010</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.http.address</name>
<value>0.0.0.0:50075</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.size</name>
<value>134217728</value>
<description>The default block size for new files.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.http.address</name>
@@ -153,7 +153,7 @@
<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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.du.reserved</name>
@@ -161,7 +161,7 @@ literal string "local" or a host:port for HDFS.</description>
<value>1073741824</value>
<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.ipc.address</name>
@@ -170,25 +170,25 @@ literal string "local" or a host:port for HDFS.</description>
The datanode ipc server address and port.
If the port is 0 then the server will start on a free port.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.blockreport.initialDelay</name>
<value>120</value>
<description>Delay for first block report in seconds.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.max.xcievers</name>
<value>1024</value>
<description>PRIVATE CONFIG VARIABLE</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!-- Permissions configuration -->
<property>
@@ -197,7 +197,7 @@ If the port is 0 then the server will start on a free port.
<description>
The octal umask used when creating files and directories.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.ugi</name>
@@ -206,7 +206,7 @@ The octal umask used when creating files and directories.
<description>The user account used by the web interface.
Syntax: USERNAME,GROUP1,GROUP2, ...
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions</name>
@@ -218,24 +218,24 @@ 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>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.permissions.supergroup</name>
<value>hdfs</value>
<description>The name of the group of super-users.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.max.response.size</name>
<value>5242880</value>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.block.access.token.enable</name>
@@ -244,7 +244,7 @@ owner or group of files or directories.
If "true", access tokens are used as capabilities for accessing datanodes.
If "false", no access tokens are checked on accessing datanodes.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.kerberos.principal</name>
@@ -252,7 +252,7 @@ If "false", no access tokens are checked on accessing datanodes.
<description>
Kerberos principal name for the NameNode
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.kerberos.principal</name>
@@ -260,7 +260,7 @@ Kerberos principal name for the NameNode
<description>
Kerberos principal name for the secondary NameNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<!--
This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
@@ -269,26 +269,26 @@ Kerberos principal name for the NameNode
<name>dfs.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
<description>The Kerberos principal for the host that the NameNode runs on.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.kerberos.https.principal</name>
<value>host/_HOST@</value>
<description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<!-- cluster variant -->
<name>dfs.secondary.http.address</name>
<value>hdp2.cybervisiontech.com.ua:50090</value>
<description>Address of secondary namenode web server</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.https.port</name>
<value>50490</value>
<description>The https port where secondary-namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.principal</name>
@@ -298,7 +298,7 @@ Kerberos principal name for the NameNode
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
@@ -307,7 +307,7 @@ Kerberos principal name for the NameNode
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.kerberos.principal</name>
@@ -315,7 +315,7 @@ Kerberos principal name for the NameNode
<description>
The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.namenode.keytab.file</name>
@@ -323,7 +323,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.secondary.namenode.keytab.file</name>
@@ -331,7 +331,7 @@ Kerberos principal name for the NameNode
<description>
Combined keytab file containing the namenode service and host principals.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.keytab.file</name>
@@ -339,19 +339,19 @@ Kerberos principal name for the NameNode
<description>
The filename of the keytab file for the DataNode.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.port</name>
<value>50470</value>
<description>The https port where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.https.address</name>
<value>hdp1.cybervisiontech.com.ua:50470</value>
<description>The https address where namenode binds</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.datanode.data.dir.perm</name>
@@ -360,7 +360,7 @@ Kerberos principal name for the NameNode
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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.access.time.precision</name>
@@ -369,18 +369,18 @@ don't exist, they will be created with this permission.</description>
The default value is 1 hour. Setting a value of 0 disables
access times for HDFS.
</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</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="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>ipc.server.read.threadpool.size</name>
<value>5</value>
<description/>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
index 44af332..6e736ff 100644
--- a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/configuration/hdfs-site.xml
@@ -23,7 +23,7 @@
<description>Determines where on the local filesystem the DFS name node
should store the name table.</description>
<final>true</final>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.support.append</name>
@@ -31,12 +31,12 @@
<description>to enable dfs append</description>
<final>true</final>
<deleted>false</deleted>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
<property>
<name>dfs.webhdfs.enabled</name>
<value>true</value>
<description>to enable webhdfs</description>
- <on-ambari-upgrade add="true" update="false" delete="false"/>
+ <on-ambari-upgrade add="true"/>
</property>
</configuration>