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 14:20:52 UTC
[92/94] ambari git commit: AMBARI-17112. Fixed implementation of
on-ambari-upgrade support. Update all stack configuration xmls to pass
validation (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
index fce4d9c..b710922 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
@@ -25,50 +25,43 @@
<name>*.workflow.engine.impl</name>
<value>org.apache.falcon.workflow.engine.OozieWorkflowEngine</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.oozie.process.workflow.builder</name>
<value>org.apache.falcon.workflow.OozieProcessWorkflowBuilder</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.oozie.feed.workflow.builder</name>
<value>org.apache.falcon.workflow.OozieFeedWorkflowBuilder</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.SchedulableEntityManager.impl</name>
<value>org.apache.falcon.resource.SchedulableEntityManager</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.ConfigSyncService.impl</name>
<value>org.apache.falcon.resource.ConfigSyncService</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.ProcessInstanceManager.impl</name>
<value>org.apache.falcon.resource.InstanceManager</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.catalog.service.impl</name>
<value>org.apache.falcon.catalog.HiveCatalogService</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.application.services</name>
@@ -83,8 +76,7 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.configstore.listeners</name>
@@ -97,66 +89,57 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.broker.impl.class</name>
<value>org.apache.activemq.ActiveMQConnectionFactory</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.shared.libs</name>
<value>activemq-core,ant,geronimo-j2ee-management,hadoop-distcp,jms,json-simple,oozie-client,spring-jms</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!--common properties-->
<property>
<name>*.domain</name>
<value>${falcon.app.type}</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.config.store.uri</name>
<value>file:///hadoop/falcon/store</value>
<description>Location to store user entity configurations</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.system.lib.location</name>
<value>${falcon.home}/server/webapp/${falcon.app.type}/WEB-INF/lib</value>
<description>Location of libraries that is shipped to Hadoop</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.retry.recorder.path</name>
<value>${falcon.log.dir}/retry</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.cleanup.service.frequency</name>
<value>days(1)</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.broker.url</name>
<value>tcp://localhost:61616</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Default Active MQ url</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.broker.ttlInMins</name>
@@ -165,23 +148,20 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.hive.shared.libs</name>
<value>hive-exec,hive-metastore,hive-common,hive-service,hive-hcatalog-server-extensions,\
hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.entity.topic</name>
<value>FALCON.ENTITY.TOPIC</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.max.retry.failure.count</name>
@@ -190,8 +170,7 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.internal.queue.size</name>
@@ -200,8 +179,7 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.graph.preserve.history</name>
@@ -210,16 +188,14 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!--properties without default values-->
<property>
<name>*.falcon.http.authentication.cookie.domain</name>
<value>EXAMPLE.COM</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.http.authentication.blacklisted.users</name>
@@ -228,23 +204,20 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!--authentication properties-->
<property>
<name>*.falcon.authentication.type</name>
<value>simple</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.http.authentication.type</name>
<value>simple</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.http.authentication.token.validity</name>
@@ -253,22 +226,19 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.http.authentication.signature.secret</name>
<value>falcon</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.http.authentication.simple.anonymous.allowed</name>
<value>true</value>
<description>Indicates if anonymous requests are allowed when using 'simple' authentication</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>*.falcon.http.authentication.kerberos.name.rules</name>
@@ -277,7 +247,6 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
<value-attributes>
<type>multiLine</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
index 7393182..a86c955 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
@@ -41,8 +41,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
@@ -69,8 +68,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.ELService.ext.functions.coord-action-create</name>
@@ -97,8 +95,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
@@ -126,8 +123,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.ELService.ext.functions.coord-action-start</name>
@@ -157,8 +153,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
@@ -172,8 +167,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.ELService.ext.functions.coord-sla-create</name>
@@ -187,8 +181,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.HadoopAccessorService.supported.filesystems</name>
@@ -199,8 +192,7 @@
<value-attributes>
<type>custom</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!--web ui should add following properties to oozie site accordingly to FALCON_USER-->
<!--<property>-->
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
index 4906d81..210a1ba 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
@@ -34,7 +34,6 @@
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
index d460004..a779fbc 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
@@ -30,8 +30,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>flume_log_dir</name>
@@ -42,15 +41,13 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>flume_run_dir</name>
<value>/var/run/flume</value>
<description>Location to save information about running agents</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>flume_user</name>
@@ -62,8 +59,7 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- flume-env.sh -->
<property>
@@ -105,7 +101,6 @@ fi
export HIVE_HOME={{flume_hive_home}}
export HCAT_HOME={{flume_hcat_home}}
</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
index b53cf87..e03b621 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
@@ -24,72 +24,62 @@
<name>ganglia_conf_dir</name>
<value>/etc/ganglia/hdp</value>
<description>Config directory for Ganglia</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ganglia_runtime_dir</name>
<value>/var/run/ganglia/hdp</value>
<description>Run directories for Ganglia</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>gmetad_user</name>
<value>nobody</value>
<property-type>USER GROUP</property-type>
<description>User </description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>gmond_user</name>
<value>nobody</value>
<property-type>USER GROUP</property-type>
<description>User </description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rrdcached_base_dir</name>
<value>/var/lib/ganglia/rrds</value>
<description>Default directory for saving the rrd files on ganglia server</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rrdcached_timeout</name>
<value>3600</value>
<description>(-w) Data is written to disk every timeout seconds. If this option is not specified the default interval of 300 seconds will be used.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rrdcached_flush_timeout</name>
<value>7200</value>
<description>(-f) Every timeout seconds the entire cache is searched for old values which are written to disk. This only concerns files to which updates have stopped, so setting this to a high value, such as 3600 seconds, is acceptable in most cases. This timeout defaults to 3600 seconds.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rrdcached_delay</name>
<value>1800</value>
<description>(-z) If specified, rrdcached will delay writing of each RRD for a random number of seconds in the range [0,delay). This will avoid too many writes being queued simultaneously. This value should be no greater than the value specified in -w. By default, there is no delay.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rrdcached_write_threads</name>
<value>4</value>
<description>(-t) Specifies the number of threads used for writing RRD files. The default is 4. Increasing this number will allow rrdcached to have more simultaneous I/O requests into the kernel. This may allow the kernel to re-order disk writes, resulting in better disk throughput.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>additional_clusters</name>
<value> </value>
<description>Add additional desired Ganglia metrics cluster in the form "name1:port1,name2:port2". Ensure that the names and ports are unique across all cluster and ports are available on ganglia server host. Ambari has reserved ports 8667-8669 within its own pool.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
index a9f6a9b..6c28288 100755
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
@@ -89,7 +89,6 @@ dfs.namenode.accesstime.precision = -1
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
index 032c187..9160853 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
@@ -29,8 +29,7 @@
<value-attributes>
<type>password</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_ssh_exkeys</name>
@@ -45,7 +44,6 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
index c6ca2ff..4017285 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
@@ -28,8 +28,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<display-name>hard nofile</display-name>
@@ -43,8 +42,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<display-name>soft nproc</display-name>
@@ -58,8 +56,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<display-name>hard nproc</display-name>
@@ -73,7 +70,6 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index cdfb493..2b4fdc6 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -26,8 +26,7 @@
<value-attributes>
<type>componentHost</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_master_address_port</name>
@@ -41,8 +40,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_standby_address_host</name>
@@ -54,8 +52,7 @@
<value-attributes>
<type>componentHost</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_segment_address_port</name>
@@ -69,8 +66,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_dfs_url</name>
@@ -84,8 +80,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_master_directory</name>
@@ -100,8 +95,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_segment_directory</name>
@@ -116,8 +110,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_master_temp_directory</name>
@@ -131,8 +124,7 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_segment_temp_directory</name>
@@ -146,8 +138,7 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- HAWQ resource manager parameters -->
<property>
@@ -174,8 +165,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_memory_limit_perseg</name>
@@ -202,8 +192,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_nvcore_limit_perseg</name>
@@ -225,8 +214,7 @@
<maximum>64</maximum>
<increment-step>4</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_yarn_address</name>
@@ -250,8 +238,7 @@
<type>string</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_yarn_scheduler_address</name>
@@ -275,8 +262,7 @@
<type>string</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_yarn_queue_name</name>
@@ -294,8 +280,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_yarn_app_name</name>
@@ -313,8 +298,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>default_hash_table_bucket_number</name>
@@ -332,8 +316,7 @@
<maximum>10000</maximum>
<increment-step>100</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_nvseg_perquery_perseg_limit</name>
@@ -350,8 +333,7 @@
<maximum>16</maximum>
<increment-step>1</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hawq_rm_nvseg_perquery_limit</name>
@@ -368,7 +350,6 @@
<maximum>10000</maximum>
<increment-step>100</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
index 0b63223..120777a 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
@@ -27,8 +27,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.shmmni</name>
@@ -41,8 +40,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.shmall</name>
@@ -55,8 +53,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.sem</name>
@@ -68,8 +65,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.sysrq</name>
@@ -84,8 +80,7 @@
<minimum>0</minimum>
<maximum>1</maximum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.core_uses_pid</name>
@@ -100,8 +95,7 @@
<minimum>0</minimum>
<maximum>1</maximum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.msgmnb</name>
@@ -114,8 +108,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.msgmax</name>
@@ -128,8 +121,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.msgmni</name>
@@ -142,8 +134,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.ipv4.tcp_syncookies</name>
@@ -158,8 +149,7 @@
<minimum>0</minimum>
<maximum>1</maximum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.ipv4.ip_forward</name>
@@ -174,8 +164,7 @@
<minimum>0</minimum>
<maximum>1</maximum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.ipv4.conf.default.accept_source_route</name>
@@ -190,8 +179,7 @@
<minimum>0</minimum>
<maximum>1</maximum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.ipv4.tcp_tw_recycle</name>
@@ -206,8 +194,7 @@
<minimum>0</minimum>
<maximum>1</maximum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.ipv4.tcp_max_syn_backlog</name>
@@ -220,8 +207,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.ipv4.conf.all.arp_filter</name>
@@ -236,8 +222,7 @@
<minimum>0</minimum>
<maximum>1</maximum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.ipv4.ip_local_port_range</name>
@@ -249,8 +234,7 @@
<value-attributes>
<type>string</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.core.netdev_max_backlog</name>
@@ -263,8 +247,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>fs.nr_open</name>
@@ -277,8 +260,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.threads-max</name>
@@ -291,8 +273,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kernel.pid_max</name>
@@ -305,8 +286,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.core.rmem_max</name>
@@ -319,8 +299,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>net.core.wmem_max</name>
@@ -333,8 +312,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>vm.overcommit_memory</name>
@@ -355,8 +333,7 @@
<maximum>2</maximum>
<increment-step>1</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>vm.overcommit_ratio</name>
@@ -369,7 +346,6 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
index 3046d00..4cc3578 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
@@ -28,8 +28,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.connect.tcpnodelay</name>
@@ -41,8 +40,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.max.idle</name>
@@ -56,8 +54,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.ping.interval</name>
@@ -71,8 +68,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.connect.timeout</name>
@@ -86,8 +82,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.connect.retry</name>
@@ -100,8 +95,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.read.timeout</name>
@@ -115,8 +109,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.write.timeout</name>
@@ -130,8 +123,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.socket.linger.timeout</name>
@@ -143,8 +135,7 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.client.read.shortcircuit</name>
@@ -156,8 +147,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.default.replica</name>
@@ -170,8 +160,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.prefetchsize</name>
@@ -184,8 +173,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.client.failover.max.attempts</name>
@@ -198,8 +186,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.default.blocksize</name>
@@ -213,8 +200,7 @@
<minimum>0</minimum>
<unit>bytes</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.client.log.severity</name>
@@ -247,8 +233,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>input.connect.timeout</name>
@@ -262,8 +247,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>input.read.timeout</name>
@@ -277,8 +261,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>input.write.timeout</name>
@@ -292,8 +275,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>input.localread.default.buffersize</name>
@@ -308,8 +290,7 @@
<minimum>0</minimum>
<unit>bytes</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>input.localread.blockinfo.cachesize</name>
@@ -323,8 +304,7 @@
<minimum>0</minimum>
<unit>bytes</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>input.read.getblockinfo.retry</name>
@@ -337,8 +317,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.replace-datanode-on-failure</name>
@@ -351,8 +330,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.default.chunksize</name>
@@ -366,8 +344,7 @@
<minimum>0</minimum>
<unit>bytes</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.default.packetsize</name>
@@ -381,8 +358,7 @@
<minimum>0</minimum>
<unit>bytes</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.default.write.retry</name>
@@ -395,8 +371,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.connect.timeout</name>
@@ -410,8 +385,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.read.timeout</name>
@@ -425,8 +399,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.write.timeout</name>
@@ -440,8 +413,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.packetpool.size</name>
@@ -455,8 +427,7 @@
<minimum>0</minimum>
<unit>bytes</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>output.close.timeout</name>
@@ -470,8 +441,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.domain.socket.path</name>
@@ -483,8 +453,7 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>dfs.client.use.legacy.blockreader.local</name>
@@ -497,7 +466,6 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
index a2703c6..d37da88 100755
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
@@ -29,8 +29,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.connect.tcpnodelay</name>
@@ -42,8 +41,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.max.idle</name>
@@ -56,8 +54,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.ping.interval</name>
@@ -71,8 +68,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.connect.timeout</name>
@@ -86,8 +82,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.connect.retry</name>
@@ -100,8 +95,7 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.read.timeout</name>
@@ -115,8 +109,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.write.timeout</name>
@@ -130,8 +123,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>rpc.client.socket.linger.timeout</name>
@@ -145,8 +137,7 @@
<minimum>0</minimum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>yarn.client.failover.max.attempts</name>
@@ -159,7 +150,6 @@
<type>int</type>
<minimum>0</minimum>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index b80c714..7387c66 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -29,8 +29,7 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_pid_dir</name>
@@ -42,8 +41,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_heapsize</name>
@@ -57,8 +55,7 @@
<unit>MB</unit>
<increment-step>256</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_xmn_max</name>
@@ -73,8 +70,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<type>int</type>
<unit>MB</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_regionserver_xmn_ratio</name>
@@ -84,8 +80,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<value-attributes>
<type>float</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_master_heapsize</name>
@@ -99,8 +94,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<unit>MB</unit>
<increment-step>256</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_user</name>
@@ -112,22 +106,19 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_user_nofile_limit</name>
<value>32000</value>
<description>Max open files limit setting for HBASE user.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_user_nproc_limit</name>
<value>16000</value>
<description>Max number of processes limit setting for HBASE user.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_java_io_tmpdir</name>
@@ -136,20 +127,17 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_principal_name</name>
<description>HBase principal name</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase_user_keytab</name>
<description>HBase keytab path</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- hbase-env.sh -->
<property>
@@ -227,7 +215,6 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
index 4f6c4af..4309456 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
@@ -141,7 +141,6 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
index 0de8039..4198789 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
@@ -28,8 +28,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>security.admin.protocol.acl</name>
@@ -39,8 +38,7 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>security.masterregion.protocol.acl</name>
@@ -50,7 +48,6 @@
The ACL is a comma-separated list of user and group names. The user and
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index c20d51d..0fae96b 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -33,8 +33,7 @@
into /tmp. Change this configuration else all data will be lost
on machine restart.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.cluster.distributed</name>
@@ -44,8 +43,7 @@
false, startup will run all HBase and ZooKeeper daemons together
in the one JVM.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.master.port</name>
@@ -56,8 +54,7 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.tmp.dir</name>
@@ -71,38 +68,33 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.local.dir</name>
<value>${hbase.tmp.dir}/local</value>
<description>Directory on the local filesystem to be used as a local storage
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.master.info.bindAddress</name>
<value>0.0.0.0</value>
<description>The bind address for the HBase Master web UI
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.master.info.port</name>
<value>60010</value>
<description>The port for the HBase Master web UI.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.info.port</name>
<value>60030</value>
<description>The port for the HBase RegionServer web UI.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.upperLimit</name>
@@ -121,8 +113,7 @@
<maximum>0.8</maximum>
<increment-step>0.01</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.handler.count</name>
@@ -138,8 +129,7 @@
<maximum>240</maximum>
<increment-step>1</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.majorcompaction</name>
@@ -154,8 +144,7 @@
<maximum>2592000000</maximum>
<unit>milliseconds</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.regionserver.global.memstore.lowerLimit</name>
@@ -169,8 +158,7 @@
<value-attributes>
<type>float</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.block.multiplier</name>
@@ -195,8 +183,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.flush.size</name>
@@ -212,8 +199,7 @@
<increment-step>1048576</increment-step>
<unit>B</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.memstore.mslab.enabled</name>
@@ -227,8 +213,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hregion.max.filesize</name>
@@ -245,8 +230,7 @@
<unit>B</unit>
<increment-step>1073741824</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.client.scanner.caching</name>
@@ -266,8 +250,7 @@
<increment-step>100</increment-step>
<unit>rows</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>zookeeper.session.timeout</name>
@@ -291,8 +274,7 @@
<unit>milliseconds</unit>
<increment-step>10000</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.client.keyvalue.maxsize</name>
@@ -313,8 +295,7 @@
<unit>B</unit>
<increment-step>262144</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hstore.compactionThreshold</name>
@@ -341,8 +322,7 @@
</entry>
</entries>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hstore.flush.retries.number</name>
@@ -350,8 +330,7 @@
<description>
The number of times the region flush operation will be retried.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.hstore.blockingStoreFiles</name>
@@ -366,8 +345,7 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hfile.block.cache.size</name>
@@ -380,8 +358,7 @@
<maximum>0.8</maximum>
<increment-step>0.01</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- Additional configuration specific to HBase security -->
<property>
@@ -397,8 +374,7 @@
<name>hbase_user</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.security.authentication</name>
@@ -421,8 +397,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.security.authorization</name>
@@ -443,8 +418,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.coprocessor.region.classes</name>
@@ -468,8 +442,7 @@
<name>hbase.security.authentication</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.coprocessor.master.classes</name>
@@ -490,8 +463,7 @@
<name>hbase.security.authorization</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
@@ -499,8 +471,7 @@
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!--
The following three properties are used together to create the list of
@@ -519,8 +490,7 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- End of properties used to generate ZooKeeper host:port quorum list. -->
<property>
@@ -533,8 +503,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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>zookeeper.znode.parent</name>
@@ -544,8 +513,7 @@
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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.client.retries.number</name>
@@ -563,8 +531,7 @@
<maximum>50</maximum>
<increment-step>1</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.rpc.timeout</name>
@@ -582,15 +549,13 @@
<unit>milliseconds</unit>
<increment-step>10000</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.defaults.for.version.skip</name>
<value>true</value>
<description>Disables version verification.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>phoenix.query.timeoutMs</name>
@@ -604,20 +569,17 @@
<unit>milliseconds</unit>
<increment-step>10000</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hbase.rpc.protection</name>
<value>authentication</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>