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/01 15:26:10 UTC
[27/94] ambari git commit: AMBARI-16272. Ambari Upgrade shouldn't
automatically add stack configs (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index 61fcbb9..3b8011a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -16,9 +16,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
-
<property>
<name>hive.cbo.enable</name>
<value>true</value>
@@ -38,8 +36,9 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.zookeeper.quorum</name>
<value>localhost:2181</value>
@@ -52,20 +51,23 @@ limitations under the License.
<type>multiLine</type>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.connect.retries</name>
<value>24</value>
<description>Number of retries while opening a connection to metastore</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.failure.retries</name>
<value>24</value>
<description>Number of retries upon failure of Thrift metastore calls</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.client.connect.retry.delay</name>
<value>5s</value>
@@ -73,8 +75,9 @@ limitations under the License.
Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
Number of seconds for the client to wait between consecutive connection attempts
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.client.socket.timeout</name>
<value>1800s</value>
@@ -82,14 +85,16 @@ limitations under the License.
Expects a time value with unit (d/day, h/hour, m/min, s/sec, ms/msec, us/usec, ns/nsec), which is sec if not specified.
MetaStore Client socket timeout in seconds
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.mapjoin.bucket.cache.size</name>
<value>10000</value>
<description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.security.authorization.manager</name>
<value>org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory</value>
@@ -103,22 +108,25 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.cluster.delegation.token.store.class</name>
<value>org.apache.hadoop.hive.thrift.ZooKeeperTokenStore</value>
<description>The delegation token store implementation.
Set to org.apache.hadoop.hive.thrift.ZooKeeperTokenStore for load-balanced cluster.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.cluster.delegation.token.store.zookeeper.connectString</name>
<value>localhost:2181</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The ZooKeeper token store connect string.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.support.dynamic.service.discovery</name>
<value>true</value>
@@ -130,34 +138,39 @@ limitations under the License.
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>fs.hdfs.impl.disable.cache</name>
<value>false</value>
<deleted>true</deleted>
<description>Disable HDFS filesystem cache.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>fs.file.impl.disable.cache</name>
<value>false</value>
<deleted>true</deleted>
<description>Disable local filesystem cache.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.scratchdir</name>
<value>/tmp/hive</value>
<description>HDFS root scratch dir for Hive jobs which gets created with write all (733) permission. For each connecting user, an HDFS scratch dir: ${hive.exec.scratchdir}/<username> is created, with ${hive.scratch.dir.permission}.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.submitviachild</name>
<value>false</value>
<description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.submit.local.task.via.child</name>
<value>true</value>
@@ -166,8 +179,9 @@ limitations under the License.
separate JVM (true recommended) or not.
Avoids the overhead of spawning new JVM, but can lead to out-of-memory issues.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.compress.output</name>
<value>false</value>
@@ -175,8 +189,9 @@ limitations under the License.
This controls whether the final outputs of a query (to a local/HDFS file or a Hive table) is compressed.
The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.compress.intermediate</name>
<value>false</value>
@@ -184,8 +199,9 @@ limitations under the License.
This controls whether intermediate files produced by Hive between multiple map-reduce jobs are compressed.
The compression codec and other options are determined from Hadoop config variables mapred.output.compress*
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.reducers.bytes.per.reducer</name>
<value>67108864</value>
@@ -196,10 +212,11 @@ limitations under the License.
<minimum>64</minimum>
<maximum>4294967296</maximum>
<unit>B</unit>
- <step-increment></step-increment>
+ <increment-step/>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.reducers.max</name>
<value>1009</value>
@@ -207,8 +224,9 @@ limitations under the License.
max number of reducers will be used. If the one specified in the configuration parameter mapred.reduce.tasks is
negative, Hive will use this one as the max number of reducers when automatically determine number of reducers.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.pre.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
@@ -223,8 +241,9 @@ limitations under the License.
<name>hive_timeline_logging_enabled</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.post.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
@@ -247,8 +266,9 @@ limitations under the License.
<name>atlas.server.https.port</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.failure.hooks</name>
<value>org.apache.hadoop.hive.ql.hooks.ATSHook</value>
@@ -263,32 +283,37 @@ limitations under the License.
<name>hive_timeline_logging_enabled</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.parallel</name>
<value>false</value>
<description>Whether to execute jobs in parallel</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.parallel.thread.number</name>
<value>8</value>
<description>How many jobs at most can be executed in parallel</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.dynamic.partition</name>
<value>true</value>
<description>Whether or not to allow dynamic partitions in DML/DDL.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.dynamic.partition.mode</name>
<value>nonstrict</value>
@@ -318,43 +343,49 @@ limitations under the License.
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.max.dynamic.partitions</name>
<value>5000</value>
<description>Maximum number of dynamic partitions allowed to be created in total.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.max.dynamic.partitions.pernode</name>
<value>2000</value>
<description>Maximum number of dynamic partitions allowed to be created in each mapper/reducer node.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.max.created.files</name>
<value>100000</value>
<description>Maximum number of HDFS files created by all mappers/reducers in a MapReduce job.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.warehouse.dir</name>
<value>/apps/hive/warehouse</value>
<description>location of default database for the warehouse</description>
<property-type>NOT_MANAGED_HDFS_PATH</property-type>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property require-input="true">
<name>javax.jdo.option.ConnectionPassword</name>
- <value></value>
+ <value/>
<property-type>PASSWORD</property-type>
<display-name>Database Password</display-name>
<description>password to use against metastore database</description>
@@ -362,8 +393,9 @@ limitations under the License.
<type>password</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
@@ -383,20 +415,23 @@ limitations under the License.
<type>hive-site</type>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.server.max.threads</name>
<value>100000</value>
<description>Maximum number of worker threads in the Thrift server's pool.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value>/etc/security/keytabs/hive.service.keytab</value>
<description>The path to the Kerberos Keytab file containing the metastore Thrift server's service principal.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.kerberos.principal</name>
<value>hive/_HOST@EXAMPLE.COM</value>
@@ -404,26 +439,30 @@ limitations under the License.
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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.cluster.delegation.token.store.zookeeper.znode</name>
<value>/hive/cluster/delegation</value>
<description>The root path for token store data.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.cache.pinobjtypes</name>
<value>Table,Database,Type,FieldSchema,Order</value>
<description>List of comma separated metastore object types that should be pinned in the cache</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.pre.event.listeners</name>
<value>org.apache.hadoop.hive.ql.security.authorization.AuthorizationPreEventListener</value>
<description>List of comma separated listeners for metastore events.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.metastore.authorization.storage.checks</name>
<value>false</value>
@@ -433,8 +472,9 @@ limitations under the License.
question doesn't have permissions to delete the corresponding directory
on the storage).
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>com.mysql.jdbc.Driver</value>
@@ -449,8 +489,9 @@ limitations under the License.
<type>hive-env</type>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>javax.jdo.option.ConnectionUserName</name>
<value>hive</value>
@@ -460,20 +501,23 @@ limitations under the License.
<type>db_user</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.cbo.enable</name>
<value>true</value>
<description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.mapjoin.optimized.hashtable</name>
<value>true</value>
@@ -481,20 +525,23 @@ limitations under the License.
Whether Hive should use memory-optimized hash table for MapJoin. Only works on Tez,
because memory-optimized hashtable cannot be serialized.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.smbjoin.cache.rows</name>
<value>10000</value>
<description>How many rows with the same key value should be cached in memory per smb joined table.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.map.aggr.hash.percentmemory</name>
<value>0.5</value>
<description>Portion of total memory to be used by map-side group aggregation hash table</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.map.aggr.hash.force.flush.memory.threshold</name>
<value>0.9</value>
@@ -502,8 +549,9 @@ limitations under the License.
The max memory to be used by map-side group aggregation hash table.
If the memory usage is higher than this number, force to flush data
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.map.aggr.hash.min.reduction</name>
<value>0.5</value>
@@ -511,32 +559,37 @@ limitations under the License.
Hash aggregation will be turned off if the ratio between hash table size and input rows is bigger than this number.
Set to 1 to make sure hash aggregation is never turned off.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.merge.mapfiles</name>
<value>true</value>
<description>Merge small files at the end of a map-only job</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.merge.mapredfiles</name>
<value>false</value>
<description>Merge small files at the end of a map-reduce job</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.merge.tezfiles</name>
<value>false</value>
<description>Merge small files at the end of a Tez DAG</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.merge.size.per.task</name>
<value>256000000</value>
<description>Size of merged files at the end of the job</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.merge.smallfiles.avgsize</name>
<value>16000000</value>
@@ -545,14 +598,16 @@ limitations under the License.
map-reduce job to merge the output files into bigger files. This is only done for map-only jobs
if hive.merge.mapfiles is true, and for map-reduce jobs if hive.merge.mapredfiles is true.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.merge.rcfile.block.level</name>
<value>true</value>
<description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.merge.orcfile.stripe.level</name>
<value>true</value>
@@ -562,8 +617,9 @@ limitations under the License.
for small ORC files. Note that enabling this config will not honor padding tolerance
config (hive.exec.orc.block.padding.tolerance).
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.orc.default.stripe.size</name>
<value>67108864</value>
@@ -576,8 +632,9 @@ limitations under the License.
<unit>B</unit>
<increment-step>8388608</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.orc.default.compress</name>
<value>ZLIB</value>
@@ -597,8 +654,9 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.orc.splits.include.file.footer</name>
<value>false</value>
@@ -606,18 +664,22 @@ limitations under the License.
If turned on splits generated by orc will include metadata about the stripes in the file. This
data is read remotely (from the client or HS2 machine) and sent to all the tasks.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.orc.compute.splits.num.threads</name>
<value>10</value>
<description>How many threads orc should use to create splits in parallel.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.join</name>
<value>true</value>
<description>Whether Hive enables the optimization about converting common join into mapjoin based on the input file size</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.auto.convert.join.noconditionaltask</name>
@@ -627,20 +689,23 @@ limitations under the License.
If this parameter 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.limit.optimize.enable</name>
<value>true</value>
<description>Whether to enable to optimization to trying a smaller subset of data for simple LIMIT first.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.tez.cpu.vcores</name>
<value>-1</value>
<description>By default Tez will ask for however many cpus map-reduce is configured to use per container. This can be used to overwrite.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.tez.log.level</name>
<value>INFO</value>
@@ -648,6 +713,8 @@ limitations under the License.
The log level to use for tasks executing as part of the DAG.
Used only if hive.tez.java.opts is used to configure Java options.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.enforce.bucketing</name>
@@ -674,26 +741,30 @@ limitations under the License.
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-
<property>
<name>hive.enforce.sortmergebucketmapjoin</name>
<value>true</value>
<description>If the user asked for sort-merge bucketed map-side join, and it cannot be performed, should the query fail or not ?</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.sortmerge.join</name>
<value>true</value>
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.sortmerge.join.to.mapjoin</name>
<value>false</value>
@@ -707,31 +778,37 @@ limitations under the License.
with few files (10 files), the sort-merge join will only use 10 mappers, and a simple map-only join might be faster
if the complete small table can fit in memory, and a map-join can be performed.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.optimize.constant.propagation</name>
<value>true</value>
<description>Whether to enable constant propagation optimizer</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.optimize.metadataonly</name>
<value>true</value>
<description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.optimize.null.scan</name>
<value>true</value>
<description>Dont scan relations which are guaranteed to not generate any rows</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-
<property>
<name>hive.optimize.bucketmapjoin</name>
<value>true</value>
<description>Whether to try bucket mapjoin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.optimize.reducededuplication</name>
<value>true</value>
@@ -739,6 +816,8 @@ limitations under the License.
Remove extra map-reduce jobs if the data is already clustered by the same key which needs to be used again.
This should always be set to true. Since it is a new feature, it has been made configurable.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.optimize.reducededuplication.min.reducer</name>
@@ -748,6 +827,8 @@ 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 automatically disabled if number of reducers would be less than specified value.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.optimize.sort.dynamic.partition</name>
@@ -772,11 +853,15 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.stats.autogather</name>
<value>true</value>
<description>A flag to gather statistics automatically during the INSERT OVERWRITE command.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.stats.dbclass</name>
@@ -785,8 +870,9 @@ limitations under the License.
Expects one of the pattern in [jdbc(:.*), hbase, counter, custom, fs].
The storage that stores temporary Hive statistics. Currently, jdbc, hbase, counter and custom type are supported.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.stats.fetch.partition.stats</name>
<value>true</value>
@@ -819,6 +905,8 @@ limitations under the License.
<name>hive.cbo.enable</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.stats.fetch.column.stats</name>
@@ -850,20 +938,23 @@ limitations under the License.
<name>hive.cbo.enable</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.zookeeper.client.port</name>
<value>2181</value>
<description>The port of ZooKeeper servers to talk to. If the list of Zookeeper servers specified in hive.zookeeper.quorum,does not contain port numbers, this value is used.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.zookeeper.namespace</name>
<value>hive_zookeeper_namespace</value>
<description>The parent node under which all ZooKeeper nodes are created.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.txn.manager</name>
<value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value>
@@ -889,8 +980,9 @@ limitations under the License.
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.txn.max.open.batch</name>
<value>1000</value>
@@ -900,8 +992,9 @@ limitations under the License.
streaming data into Hive. But it will also increase the number of
open transactions at any given time, possibly impacting read performance.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.support.concurrency</name>
<value>false</value>
@@ -929,16 +1022,18 @@ limitations under the License.
<name>hive_txn_acid</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.cli.print.header</name>
<value>false</value>
<description>
Whether to print the names of the columns in query output.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.worker.timeout</name>
<value>86400L</value>
@@ -947,6 +1042,8 @@ limitations under the License.
Time before a given compaction in working state is declared a failure
and returned to the initiated state.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.compactor.check.interval</name>
@@ -956,12 +1053,15 @@ limitations under the License.
Time between checks to see if any partitions need compacted.
This should be kept high because each check for compaction requires many calls against the NameNode.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compactor.delta.pct.threshold</name>
<value>0.1f</value>
<description>Percentage (by size) of base that deltas can be before major compaction is initiated.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.fetch.task.conversion</name>
@@ -975,6 +1075,8 @@ limitations under the License.
1. minimal : SELECT STAR, FILTER on partition columns, LIMIT only
2. more : SELECT, FILTER, LIMIT only (support TABLESAMPLE and virtual columns)
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.fetch.task.conversion.threshold</name>
@@ -984,6 +1086,8 @@ limitations under the License.
is calculated by summation of file lengths. If it's not native, storage handler for the table
can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator interface.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.fetch.task.aggr</name>
@@ -993,8 +1097,9 @@ limitations under the License.
final aggregations in single reduce task. If this is set true, Hive delegates final aggregation
stage to fetch task, possibly decreasing the query time.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.security.authorization.enabled</name>
<value>false</value>
@@ -1020,8 +1125,9 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.security.authenticator.manager</name>
<value>org.apache.hadoop.hive.ql.security.ProxyUserAuthenticator</value>
@@ -1035,6 +1141,8 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.security.metastore.authorization.manager</name>
@@ -1051,11 +1159,15 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.security.metastore.authorization.auth.reads</name>
<value>true</value>
<description>If this is true, metastore authorizer authorizes read actions on database, table</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.security.metastore.authenticator.manager</name>
@@ -1064,36 +1176,44 @@ limitations under the License.
authenticator manager class name to be used in the metastore for authentication.
The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.logging.operation.enabled</name>
<value>true</value>
<description>When true, HS2 will save operation logs</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.logging.operation.log.location</name>
<value>/tmp/hive/operation_logs</value>
<description>Top level directory where operation logs are stored if logging functionality is enabled</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.zookeeper.namespace</name>
<value>hiveserver2</value>
<description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.thrift.http.port</name>
<value>10001</value>
<description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.thrift.http.path</name>
<value>cliservice</value>
<description>Path component of URL endpoint when in HTTP mode.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.thrift.port</name>
<value>10000</value>
@@ -1105,6 +1225,8 @@ limitations under the License.
<overridable>false</overridable>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.thrift.sasl.qop</name>
@@ -1118,20 +1240,23 @@ limitations under the License.
"auth-conf" - authentication plus integrity and confidentiality protection
This is applicable only if HiveServer2 is configured to use Kerberos authentication.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.thrift.max.worker.threads</name>
<value>500</value>
<description>Maximum number of Thrift worker threads</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.allow.user.substitution</name>
<value>true</value>
<description>Allow alternate user to be specified as part of HiveServer2 open connection request.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.authentication.spnego.keytab</name>
<value>HTTP/_HOST@EXAMPLE.COM</value>
@@ -1147,8 +1272,9 @@ limitations under the License.
hive.server2.authentication.spnego.keytab
are specified.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.authentication</name>
<description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description>
@@ -1180,8 +1306,9 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.authentication.spnego.principal</name>
<value>/etc/security/keytabs/spnego.service.keytab</value>
@@ -1192,8 +1319,9 @@ limitations under the License.
and HTTP transport mode is used.
This needs to be set only if SPNEGO is to be used in authentication.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.enable.doAs</name>
<value>true</value>
@@ -1222,6 +1350,8 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.table.type.mapping</name>
@@ -1233,8 +1363,9 @@ limitations under the License.
HIVE : Exposes Hive's native table types like MANAGED_TABLE, EXTERNAL_TABLE, VIRTUAL_VIEW
CLASSIC : More generic types like TABLE and VIEW
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.use.SSL</name>
<value>false</value>
@@ -1254,14 +1385,16 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.conf.restricted.list</name>
<value>hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role</value>
<description>Comma separated list of configuration options which are immutable at runtime</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.user.install.directory</name>
<value>/user/</value>
@@ -1270,8 +1403,9 @@ limitations under the License.
it will upload the hive jar to "hive.user.install.directory/user.name"
and use it to run queries.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.maxentries</name>
<value>100000</value>
@@ -1279,8 +1413,9 @@ limitations under the License.
Max number of entries in the vector group by aggregation hashtables.
Exceeding this will trigger a flush irrelevant of memory pressure condition.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.prewarm.enabled</name>
<value>false</value>
@@ -1300,6 +1435,8 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.prewarm.numcontainers</name>
@@ -1312,8 +1449,9 @@ limitations under the License.
<maximum>20</maximum>
<increment-step>1</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.convert.join.bucket.mapjoin.tez</name>
<value>false</value>
@@ -1321,8 +1459,9 @@ limitations under the License.
Whether joins can be automatically converted to bucket map joins in hive
when tez is used as the execution engine.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.tez.auto.reducer.parallelism</name>
<value>false</value>
@@ -1346,11 +1485,15 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.tez.max.partition.factor</name>
<value>2.0</value>
<description>When auto reducer parallelism is enabled this factor will be used to over-partition data in shuffle edges.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.tez.min.partition.factor</name>
@@ -1359,6 +1502,8 @@ limitations under the License.
When auto reducer parallelism is enabled this factor will be used to put a lower limit to the number
of reducers that tez specifies.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.tez.dynamic.partition.pruning</name>
@@ -1379,23 +1524,30 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.tez.dynamic.partition.pruning.max.event.size</name>
<value>1048576</value>
<description>Maximum size of events sent by processors in dynamic pruning. If this size is crossed no pruning will take place.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.tez.dynamic.partition.pruning.max.data.size</name>
<value>104857600</value>
<description>Maximum total data size of events in dynamic pruning.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.tez.smb.number.waves</name>
<value>0.5</value>
<description>The number of waves in which to run the SMB join. Account for cluster being occupied. Ideally should be 1 wave.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- missing from HiveConf -->
<property>
<name>hive.heapsize</name>
@@ -1405,15 +1557,17 @@ limitations under the License.
<value-attributes>
<type>int</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.enable.impersonation</name>
<value>true</value>
<deleted>true</deleted>
<description>Enable user impersonation for HiveServer2</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ambari.hive.db.schema.name</name>
<value>hive</value>
@@ -1423,15 +1577,17 @@ limitations under the License.
<type>database</type>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.sortmerge.join.noconditionaltask</name>
<value>true</value>
<deleted>true</deleted>
<description>Required to Enable the conversion of an SMB (Sort-Merge-Bucket) to a map-join SMB.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.optimize.mapjoin.mapreduce</name>
<value>true</value>
@@ -1441,10 +1597,10 @@ 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<!-- performance -->
-
<property>
<name>hive.vectorized.execution.enabled</name>
<value>true</value>
@@ -1467,8 +1623,9 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.auto.convert.join.noconditionaltask.size</name>
<value>52428800</value>
@@ -1482,7 +1639,7 @@ limitations under the License.
<minimum>8192</minimum>
<maximum>17179869184</maximum>
<unit>B</unit>
- <step-increment></step-increment>
+ <increment-step/>
</value-attributes>
<depends-on>
<property>
@@ -1490,8 +1647,9 @@ limitations under the License.
<name>hive.tez.container.size</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.optimize.index.filter</name>
<value>true</value>
@@ -1511,8 +1669,9 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.execution.engine</name>
<value>tez</value>
@@ -1535,20 +1694,23 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.checkinterval</name>
<value>4096</value>
<description>Number of entries added to the group by aggregation hash before a recomputation of average entry size is performed.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.groupby.flush.percent</name>
<value>0.1</value>
<description>Percent of entries in the group by aggregation hash flushed when the memory threshold is exceeded.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.compute.query.using.stats</name>
<value>true</value>
@@ -1578,14 +1740,16 @@ limitations under the License.
<name>hive.cbo.enable</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.limit.pushdown.memory.usage</name>
<value>0.04</value>
<description>The max memory to be used for hash in RS operator for top K selection.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.sessions.per.default.queue</name>
<value>1</value>
@@ -1601,8 +1765,9 @@ limitations under the License.
<maximum>10</maximum>
<increment-step>1</increment-step>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.initialize.default.sessions</name>
<value>false</value>
@@ -1626,8 +1791,9 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.tez.default.queues</name>
<display-name>Default query queues</display-name>
@@ -1653,8 +1819,9 @@ limitations under the License.
<name>yarn.scheduler.capacity.root.queues</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.orc.encoding.strategy</name>
<value>SPEED</value>
@@ -1685,8 +1852,9 @@ limitations under the License.
<name>hive_exec_orc_storage_strategy</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.exec.orc.compression.strategy</name>
<value>SPEED</value>
@@ -1715,8 +1883,9 @@ limitations under the License.
<name>hive_exec_orc_storage_strategy</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.vectorized.execution.reduce.enabled</name>
<value>false</value>
@@ -1739,8 +1908,9 @@ limitations under the License.
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.server2.authentication.ldap.url</name>
<value> </value>
@@ -1751,6 +1921,8 @@ limitations under the License.
<name>hive.server2.authentication</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.authentication.ldap.baseDN</name>
@@ -1761,6 +1933,8 @@ limitations under the License.
<name>hive.server2.authentication</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.authentication.kerberos.keytab</name>
@@ -1772,6 +1946,8 @@ limitations under the License.
<name>hive.server2.authentication</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.authentication.kerberos.principal</name>
@@ -1783,6 +1959,8 @@ limitations under the License.
<name>hive.server2.authentication</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.authentication.pam.services</name>
@@ -1793,6 +1971,8 @@ limitations under the License.
<name>hive.server2.authentication</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hive.server2.custom.authentication.class</name>
@@ -1803,14 +1983,19 @@ limitations under the License.
<name>hive.server2.authentication</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>datanucleus.autoCreateSchema</name>
<value>false</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>datanucleus.fixedDatastore</name>
<value>true</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
index 5a2f002..0080a1e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
@@ -16,9 +16,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
-
<property>
<name>hive.security.authenticator.manager</name>
<value>org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator</value>
@@ -29,8 +27,9 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.security.authorization.manager</name>
<value>org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory</value>
@@ -42,8 +41,9 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.security.authorization.enabled</name>
<value>false</value>
@@ -69,18 +69,20 @@ limitations under the License.
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>hive.conf.restricted.list</name>
<value>hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role</value>
- <description></description>
+ <description/>
<depends-on>
<property>
<type>hive-env</type>
<name>hive_security_authorization</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
index 756e953..23387fe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
@@ -19,36 +19,39 @@
*/
-->
<configuration supports_final="true">
-
<property>
<name>policy_user</name>
<value>ambari-qa</value>
<display-name>Policy user for HIVE</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
- </property>
-
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>jdbc.driverClassName</name>
<value>org.apache.hive.jdbc.HiveDriver</value>
<description>Used for repository creation on ranger admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>common.name.for.certificate</name>
- <value></value>
+ <value/>
<description>Common name for certificate, this value should match what is specified in repo within ranger admin</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>hive</value>
<display-name>Ranger repository config user</display-name>
<description>Used for repository creation on ranger admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
<value>hive</value>
@@ -58,13 +61,14 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
<value>true</value>
<display-name>Audit to DB</display-name>
- <description></description>
+ <description/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -74,13 +78,14 @@
<name>xasecure.audit.destination.db</name>
</property>
</depends-on>
- </property>
-
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>XAAUDIT.HDFS.IS_ENABLED</name>
<value>false</value>
<display-name>Audit to HDFS</display-name>
- <description></description>
+ <description/>
<value-attributes>
<type>boolean</type>
</value-attributes>
@@ -90,153 +95,175 @@
<name>xasecure.audit.destination.hdfs</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
<value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
- <description></description>
+ <description/>
<depends-on>
<property>
<type>ranger-env</type>
<name>xasecure.audit.destination.hdfs.dir</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>
<value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name>
<value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.DESTINTATION_FILE</name>
<value>%hostname%-audit.log</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name>
<value>900</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name>
<value>86400</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name>
<value>60</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name>
<value>%time:yyyyMMdd-HHmm.ss%.log</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name>
<value>60</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name>
<value>600</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
<value>10</value>
- <description></description>
+ <description/>
<value-attributes>
<type>password</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>SSL_KEYSTORE_FILE_PATH</name>
<value>/etc/hadoop/conf/ranger-plugin-keystore.jks</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>SSL_KEYSTORE_PASSWORD</name>
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
- <description></description>
+ <description/>
<value-attributes>
<type>password</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>SSL_TRUSTSTORE_FILE_PATH</name>
<value>/etc/hadoop/conf/ranger-plugin-truststore.jks</value>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
<value>changeit</value>
<property-type>PASSWORD</property-type>
- <description></description>
+ <description/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name>
<value>true</value>
<display-name>Should Hive GRANT/REVOKE update XA policies</display-name>
- <description></description>
+ <description/>
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>POLICY_MGR_URL</name>
<value>{{policymgr_mgr_url}}</value>
- <description>Policy Manager url</description>
- </property>
-
+ <description>Policy Manager url</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>SQL_CONNECTOR_JAR</name>
<value>{{sql_connector_jar}}</value>
- <description>Location of DB client library (please check the location of the jar file)</description>
- </property>
-
+ <description>Location of DB client library (please check the location of the jar file)</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>XAAUDIT.DB.FLAVOUR</name>
<value>{{xa_audit_db_flavor}}</value>
- <description>The database type to be used (mysql/oracle)</description>
- </property>
-
+ <description>The database type to be used (mysql/oracle)</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>XAAUDIT.DB.DATABASE_NAME</name>
<value>{{xa_audit_db_name}}</value>
- <description>Audit database name</description>
- </property>
-
+ <description>Audit database name</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>XAAUDIT.DB.USER_NAME</name>
<value>{{xa_audit_db_user}}</value>
- <description>Audit database user</description>
- </property>
-
+ <description>Audit database user</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
+ </property>
<property>
<name>XAAUDIT.DB.PASSWORD</name>
<value>{{xa_audit_db_password}}</value>
@@ -245,18 +272,21 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>XAAUDIT.DB.HOSTNAME</name>
<value>{{xa_db_host}}</value>
<description>Audit database hostname</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>REPOSITORY_NAME</name>
<value>{{repo_name}}</value>
- <description>Ranger repository name</description>
+ <description>Ranger repository name</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml
index 2fad897..2be5459 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/webhcat-site.xml
@@ -16,31 +16,31 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- The default settings for Templeton. -->
<!-- Edit templeton-site.xml to change settings for your local -->
<!-- install. -->
-
<configuration supports_final="true">
-
<property>
<name>templeton.jar</name>
<value>/usr/hdp/${hdp.version}/hive/share/webhcat/svr/lib/hive-webhcat-*.jar</value>
<description>The path to the Templeton jar file.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.libjars</name>
<value>/usr/hdp/${hdp.version}/zookeeper/zookeeper.jar</value>
<description>Jars to add the the classpath.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hadoop</name>
<value>/usr/hdp/${hdp.version}/hadoop/bin/hadoop</value>
<description>The path to the Hadoop executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.pig.archive</name>
<value>hdfs:///hdp/apps/${hdp.version}/pig/pig.tar.gz</value>
@@ -48,20 +48,23 @@ limitations under the License.
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.pig.path</name>
<value>pig.tar.gz/pig/bin/pig</value>
<description>The path to the Pig executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hcat</name>
<value>/usr/hdp/${hdp.version}/hive/bin/hcat</value>
<description>The path to the hcatalog executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hive.archive</name>
<value>hdfs:///hdp/apps/${hdp.version}/hive/hive.tar.gz</value>
@@ -69,53 +72,61 @@ limitations under the License.
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hive.home</name>
<value>hive.tar.gz/hive</value>
<description>The path to the Hive home within the tar. Has no effect if templeton.hive.archive is not set.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hcat.home</name>
<value>hive.tar.gz/hive/hcatalog</value>
<description>The path to the HCat home within the tar. Has no effect if templeton.hive.archive is not set.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hive.path</name>
<value>hive.tar.gz/hive/bin/hive</value>
<description>The path to the Hive executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.sqoop.archive</name>
<value>hdfs:///hdp/apps/${hdp.version}/sqoop/sqoop.tar.gz</value>
<description>The path to the Sqoop archive in HDFS.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.sqoop.path</name>
<value>sqoop.tar.gz/sqoop/bin/sqoop</value>
<description>The path to the Sqoop executable.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.sqoop.home</name>
<value>sqoop.tar.gz/sqoop</value>
<description>The path to the Sqoop home within the tar. Has no effect if
templeton.sqoop.archive is not set.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.streaming.jar</name>
<value>hdfs:///hdp/apps/${hdp.version}/mapreduce/hadoop-streaming.jar</value>
<description>The hdfs path to the Hadoop streaming jar file.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
- <property>
+ <property>
<name>templeton.hive.extra.files</name>
<value>/etc/tez/conf/tez-site.xml,/usr/hdp/${hdp.version}/tez,/usr/hdp/${hdp.version}/tez/lib</value>
<description>The resources in this list will be localized to the node running LaunchMapper and added to HADOOP_CLASSPTH
@@ -126,5 +137,7 @@ limitations under the License.
This can be used to specify config files, Tez artifacts, etc. This will be sent -files option of hadoop jar command thus
each path is interpreted by Generic Option Parser. It can be local or hdfs path.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
index 6c35344..3462cc1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/configuration/ranger-knox-plugin-properties.xml
@@ -19,12 +19,12 @@
*/
-->
<configuration supports_final="true">
-
<property>
<name>KNOX_HOME</name>
<value>/usr/hdp/current/knox-server</value>
<display-name>Knox Home</display-name>
<description>Knox home folder</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
index 9f8847a..fccd093 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-env.xml
@@ -19,7 +19,6 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
<!-- oozie-env.sh -->
<property>
@@ -109,6 +108,7 @@ export HADOOP_OPTS="-Dhdp.version=${HDP_VERSION} ${HADOOP_OPTS}"
<value-attributes>
<type>content</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f855d53/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
index ef3e901..da19dfe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
@@ -16,9 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
-
<property>
<name>oozie.service.coord.check.maximum.frequency</name>
<value>false</value>
@@ -27,6 +25,8 @@
this check or submit coordinators with frequencies faster than 5 minutes: doing so can cause unintended behavior and
additional system stress.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>oozie.services</name>
@@ -71,13 +71,15 @@
All services to be created and managed by Oozie Services singleton.
Class names must be separated by commas.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>oozie.service.SchemaService.wf.ext.schemas</name>
<value>shell-action-0.1.xsd,shell-action-0.2.xsd,shell-action-0.3.xsd,email-action-0.1.xsd,email-action-0.2.xsd,hive-action-0.2.xsd,hive-action-0.3.xsd,hive-action-0.4.xsd,hive-action-0.5.xsd,sqoop-action-0.2.xsd,sqoop-action-0.3.xsd,sqoop-action-0.4.xsd,ssh-action-0.1.xsd,ssh-action-0.2.xsd,distcp-action-0.1.xsd,distcp-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>oozie.service.AuthorizationService.security.enabled</name>
<value>true</value>
@@ -85,16 +87,18 @@
Specifies whether security (user name/admin role) is enabled or not.
If disabled any user can manage Oozie system and manage any job.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>oozie.service.HadoopAccessorService.kerberos.enabled</name>
<value>false</value>
<description>
Indicates if Oozie is configured to use Kerberos.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>oozie.authentication.simple.anonymous.allowed</name>
<value>true</value>
@@ -102,6 +106,7 @@
Indicates if anonymous requests are allowed.
This setting is meaningful only when using 'simple' authentication.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>