http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml index 4c9b63e..9bd478e 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-site.xml @@ -24,9 +24,9 @@ limitations under the License. <value>hive</value> <display-name>Database Name</display-name> <description>Database name used as the Hive Metastore</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>database</type> - <type>host</type> <overridable>false</overridable> </value-attributes> </property> @@ -39,6 +39,7 @@ limitations under the License. <value-attributes> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false"/> </property> <property> @@ -46,6 +47,7 @@ limitations under the License. <value>com.mysql.jdbc.Driver</value> <display-name>JDBC Driver Class</display-name> <description>Driver class name for a JDBC metastore</description> + <on-ambari-upgrade add="true"/> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -56,6 +58,7 @@ limitations under the License. <value>hive</value> <display-name>Database Username</display-name> <description>username to use against metastore database</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>db_user</type> <overridable>false</overridable> @@ -68,6 +71,7 @@ limitations under the License. <property-type>PASSWORD</property-type> <display-name>Database Password</display-name> <description>password to use against metastore database</description> + <on-ambari-upgrade add="true"/> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -77,6 +81,7 @@ limitations under the License. <name>hive.metastore.warehouse.dir</name> <value>/apps/hive/warehouse</value> <description>location of default database for the warehouse</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -84,30 +89,35 @@ limitations under the License. <value>false</value> <description>If true, the metastore thrift interface will be secured with SASL. Clients must authenticate with Kerberos.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.metastore.cache.pinobjtypes</name> <value>Table,Database,Type,FieldSchema,Order</value> <description>List of comma separated metastore object types that should be pinned in the cache</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.metastore.uris</name> <value>thrift://localhost:9083</value> <description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description> + <on-ambari-upgrade add="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"/> </property> <property> <name>datanucleus.autoCreateSchema</name> <value>false</value> <description>Creates necessary schema on a startup if one doesn't exist</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -117,12 +127,14 @@ 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"/> </property> <property> <name>hive.metastore.execute.setugi</name> <value>true</value> <description>In unsecure mode, setting this property to true will cause the metastore to execute DFS operations using the client's reported user and group permissions. Note that this property must be set on both the client and server sides. Further note that its best effort. If client sets its to true and server sets it to false, client setting will be ignored.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -130,6 +142,7 @@ limitations under the License. <value>false</value> <description>enable or disable the Hive client authorization</description> <display-name>Enable Authorization</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -159,6 +172,7 @@ limitations under the License. The Hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -176,6 +190,7 @@ limitations under the License. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -191,6 +206,7 @@ limitations under the License. hive client authenticator manager class name. The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -207,6 +223,7 @@ limitations under the License. Hive operations as the user making the calls to it. </description> <display-name>Run as end user instead of Hive user</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -238,6 +255,7 @@ limitations under the License. <value-attributes> <type>int</type> </value-attributes> + <on-ambari-upgrade add="false"/> </property> <property> @@ -245,6 +263,7 @@ limitations under the License. <value>true</value> <deleted>true</deleted> <description>Enable user impersonation for HiveServer2</description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -252,6 +271,7 @@ limitations under the License. <description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description> <value>NONE</value> <display-name>HiveServer2 Authentication</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -284,36 +304,42 @@ limitations under the License. <name>fs.hdfs.impl.disable.cache</name> <value>true</value> <description>Disable HDFS filesystem cache.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>fs.file.impl.disable.cache</name> <value>true</value> <description>Disable local filesystem cache.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.enforce.bucketing</name> <value>true</value> <description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description> + <on-ambari-upgrade add="true"/> </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"/> </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"/> </property> <property> <name>hive.optimize.bucketmapjoin</name> <value>true</value> <description>Whether to try bucket mapjoin</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -322,24 +348,28 @@ limitations under the License. <description> If the tables being joined are sorted and bucketized on the join columns, and they have the same number of buckets, a sort-merge join can be performed by setting this parameter as true. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.mapred.reduce.tasks.speculative.execution</name> <value>false</value> <description>Whether speculative execution for reducers should be turned on. </description> + <on-ambari-upgrade add="true"/> </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"/> </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"/> </property> <property> @@ -347,6 +377,7 @@ limitations under the License. <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="false"/> </property> <property> @@ -362,6 +393,7 @@ 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"/> </property> <property> @@ -372,6 +404,7 @@ 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"/> </property> <property> @@ -382,6 +415,7 @@ limitations under the License. converted to a mapjoin(there is no conditional task). </description> <display-name>For Map Join, per Map memory threshold</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>8192</minimum> @@ -400,12 +434,14 @@ 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"/> </property> <property> <name>hive.mapjoin.bucket.cache.size</name> <value>10000</value> <description/> + <on-ambari-upgrade add="true"/> </property> <!-- performance --> @@ -418,6 +454,7 @@ limitations under the License. The default value is false. </description> <display-name>Enable Vectorization and Map Vectorization</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -441,6 +478,7 @@ 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"/> </property> <property> @@ -451,6 +489,7 @@ limitations under the License. That means if reducer-num of the child RS is fixed (order by or forced bucketing) and small, it can make very slow, single MR. The optimization will be automatically disabled if number of reducers would be less than specified value. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -458,6 +497,7 @@ limitations under the License. <value>true</value> <description>Whether to enable automatic use of indexes</description> <display-name>Push Filters to Storage</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -481,6 +521,7 @@ limitations under the License. <description> TCP port number to listen on, default 10000. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <overridable>false</overridable> <type>int</type> @@ -495,6 +536,7 @@ limitations under the License. when it is brought up. JDBC/ODBC clients should use the ZooKeeper ensemble: hive.zookeeper.quorum in their connection string. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -504,6 +546,7 @@ limitations under the License. <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"/> </property> <property> @@ -513,6 +556,7 @@ limitations under the License. Expects one of [binary, http]. Transport mode of HiveServer2. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -520,6 +564,7 @@ limitations under the License. <value>TextFile</value> <description>Default file format for CREATE TABLE statement.</description> <display-name>Default File Format</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -540,6 +585,7 @@ limitations under the License. <value>true</value> <description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description> <display-name>Enable Cost Based Optimizer</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -569,6 +615,7 @@ 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"/> </property> <property> @@ -580,6 +627,7 @@ limitations under the License. org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager, 2. When HiveServer2 supports service discovery via Zookeeper. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>multiLine</type> <empty-value-valid>true</empty-value-valid> @@ -590,12 +638,14 @@ limitations under the License. <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"/> </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"/> </property> <property> @@ -605,6 +655,7 @@ 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"/> </property> <property> @@ -612,24 +663,28 @@ limitations under the License. <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"/> </property> <property> <name>hive.cluster.delegation.token.store.zookeeper.connectString</name> <value>localhost:2181</value> <description>The ZooKeeper token store connect string.</description> + <on-ambari-upgrade add="true"/> </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"/> </property> <property> <name>hive.exec.submitviachild</name> <value>false</value> <description/> + <on-ambari-upgrade add="true"/> </property> <property> @@ -640,6 +695,7 @@ 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"/> </property> <property> @@ -649,6 +705,7 @@ 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"/> </property> <property> @@ -658,6 +715,7 @@ 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"/> </property> <property> @@ -665,12 +723,13 @@ limitations under the License. <value>67108864</value> <description>Defines the size per reducer. For example, if it is set to 64M, given 256M input size, 4 reducers will be used.</description> <display-name>Data per Reducer</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>64</minimum> <maximum>4294967296</maximum> <unit>B</unit> - <step-increment></step-increment> + <increment-step></increment-step> </value-attributes> </property> @@ -681,6 +740,7 @@ 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"/> </property> <property> @@ -691,6 +751,7 @@ limitations under the License. A pre-execution hook is specified as the name of a Java class which implements the org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -707,6 +768,7 @@ limitations under the License. A post-execution hook is specified as the name of a Java class which implements the org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -723,6 +785,7 @@ limitations under the License. An on-failure hook is specified as the name of Java class which implements the org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext interface. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -735,18 +798,21 @@ limitations under the License. <name>hive.exec.parallel</name> <value>false</value> <description>Whether to execute jobs in parallel</description> + <on-ambari-upgrade add="true"/> </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"/> </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"/> </property> <property> @@ -758,6 +824,7 @@ limitations under the License. NonStrict allows all partitions of a table to be dynamic. </description> <display-name>Allow all partitions to be Dynamic</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -784,30 +851,35 @@ limitations under the License. <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"/> </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"/> </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"/> </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"/> </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"/> </property> <property> @@ -817,12 +889,14 @@ 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"/> </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"/> </property> <property> @@ -834,18 +908,21 @@ limitations under the License. question doesn't have permissions to delete the corresponding directory on the storage). </description> + <on-ambari-upgrade add="true"/> </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"/> </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"/> </property> <property> @@ -855,6 +932,7 @@ 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"/> </property> <property> @@ -864,24 +942,28 @@ 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"/> </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"/> </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"/> </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"/> </property> <property> @@ -892,12 +974,14 @@ 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"/> </property> <property> <name>hive.merge.rcfile.block.level</name> <value>true</value> <description/> + <on-ambari-upgrade add="true"/> </property> <property> @@ -909,6 +993,7 @@ 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"/> </property> <property> @@ -916,6 +1001,7 @@ limitations under the License. <value>67108864</value> <description>Define the default ORC stripe size</description> <display-name>Default ORC Stripe Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>8388608</minimum> @@ -930,6 +1016,7 @@ limitations under the License. <value>ZLIB</value> <description>Define the default compression codec for ORC file</description> <display-name>ORC Compression Algorithm</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -954,6 +1041,7 @@ limitations under the License. compression level of higher level compression codec (like ZLIB). </description> <display-name>ORC Compression Strategy</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -986,6 +1074,7 @@ limitations under the License. options are SPEED and COMPRESSION. </description> <display-name>ORC Encoding Strategy</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1015,18 +1104,21 @@ 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"/> </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"/> </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"/> </property> <property> @@ -1034,6 +1126,7 @@ limitations under the License. <value>true</value> <description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description> <display-name>Enforce bucketing</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1060,22 +1153,26 @@ limitations under the License. <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"/> </property> <property> <name>hive.optimize.constant.propagation</name> <value>true</value> <description>Whether to enable constant propagation optimizer</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.optimize.metadataonly</name> <value>true</value> <description/> + <on-ambari-upgrade add="true"/> </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"/> </property> <property> @@ -1087,6 +1184,7 @@ limitations under the License. in the reducer thereby reducing the memory pressure on reducers. </description> <display-name>Sort Partitions Dynamically</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1107,6 +1205,7 @@ limitations under the License. <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"/> </property> <property> <name>hive.stats.dbclass</name> @@ -1115,6 +1214,7 @@ 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"/> </property> <property> @@ -1129,6 +1229,7 @@ limitations under the License. and will estimate the number of rows from row schema. </description> <display-name>Fetch partition stats at compiler</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1165,6 +1266,7 @@ limitations under the License. of column statistics from metastore. </description> <display-name>Fetch column stats at compiler</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1195,12 +1297,14 @@ limitations under the License. <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"/> </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"/> </property> <property> @@ -1208,6 +1312,7 @@ limitations under the License. <value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value> <description/> <display-name>Transaction Manager</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1239,6 +1344,7 @@ 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"/> </property> <property> @@ -1248,6 +1354,7 @@ limitations under the License. Support concurrency and use locks, needed for Transactions. Requires Zookeeper. </description> <display-name>Use Locking</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1276,6 +1383,7 @@ limitations under the License. <description> Whether to print the names of the columns in query output. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -1286,6 +1394,7 @@ 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"/> </property> <property> <name>hive.compactor.check.interval</name> @@ -1295,12 +1404,14 @@ 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"/> </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"/> </property> <property> <name>hive.fetch.task.conversion</name> @@ -1314,6 +1425,7 @@ 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"/> </property> <property> <name>hive.fetch.task.conversion.threshold</name> @@ -1323,6 +1435,7 @@ 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"/> </property> <property> <name>hive.fetch.task.aggr</name> @@ -1332,6 +1445,7 @@ 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"/> </property> <property> @@ -1341,6 +1455,7 @@ limitations under the License. The Hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -1353,6 +1468,7 @@ limitations under the License. <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"/> </property> <property> <name>hive.security.metastore.authenticator.manager</name> @@ -1361,29 +1477,34 @@ 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"/> </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"/> </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"/> </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"/> </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"/> </property> <property> @@ -1398,18 +1519,21 @@ 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"/> </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"/> </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"/> </property> <property> @@ -1427,6 +1551,7 @@ limitations under the License. hive.server2.authentication.spnego.keytab are specified. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -1439,6 +1564,7 @@ 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"/> </property> @@ -1452,6 +1578,7 @@ 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"/> </property> <property> @@ -1459,6 +1586,7 @@ limitations under the License. <value>false</value> <description/> <display-name>Use SSL</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1479,10 +1607,12 @@ limitations under the License. <name>hive.server2.keystore.path</name> <value>/etc/security/keystores/hs2keystore.jks</value> <description>SSL certificate keystore location</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.keystore.password</name> <value>password</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>SSL certificate keystore password</description> </property> @@ -1491,6 +1621,7 @@ limitations under the License. <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"/> </property> <property> @@ -1500,6 +1631,7 @@ 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"/> </property> <property> @@ -1507,6 +1639,7 @@ limitations under the License. <value>false</value> <description>Enables container prewarm for Tez (Hadoop 2 only)</description> <display-name>Hold Containers to Reduce Latency</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1528,6 +1661,7 @@ limitations under the License. <value>3</value> <description>Controls the number of containers to prewarm for Tez (Hadoop 2 only)</description> <display-name>Number of Containers Held</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>1</minimum> @@ -1544,6 +1678,7 @@ limitations under the License. query execution. </description> <display-name>Enable Reduce Vectorization</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1567,6 +1702,7 @@ limitations under the License. Chooses execution engine. Option is: mr (Map reduce, default) </description> <display-name>hive.execution.engine</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1583,12 +1719,14 @@ limitations under the License. <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"/> </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"/> </property> <property> @@ -1600,6 +1738,7 @@ limitations under the License. For more advanced stats collection need to run analyze table queries. </description> <display-name>Compute simple queries using stats only</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1626,12 +1765,14 @@ limitations under the License. <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"/> </property> <property> <name>hive.txn.timeout</name> <value>300</value> <description>Time after which transactions are declared aborted if the client has not sent a heartbeat, in seconds.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -1639,6 +1780,7 @@ limitations under the License. <value>false</value> <description>Whether to run the compactor's initiator thread in this metastore instance or not. If there is more than one instance of the thrift metastore this should only be set to true for one of them.</description> <display-name>Run Compactor</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -1666,6 +1808,7 @@ limitations under the License. <value>0</value> <description>Number of compactor worker threads to run on this metastore instance. Can be different values on different metastore instances.</description> <display-name>Number of threads used by Compactor</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -1684,18 +1827,21 @@ limitations under the License. <name>hive.compactor.delta.num.threshold</name> <value>10</value> <description>Number of delta files that must exist in a directory before the compactor will attempt a minor compaction.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.compactor.abortedtxn.threshold</name> <value>1000</value> <description>Number of aborted transactions involving a particular table or partition before major compaction is initiated.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>datanucleus.cache.level2.type</name> <value>none</value> <description>Determines caching mechanism DataNucleus L2 cache will use. It is strongly recommended to use default value of 'none' as other values may cause consistency errors in Hive.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -1704,6 +1850,7 @@ limitations under the License. <description>The maximum number of bytes that a query using the compact index can read. Negative value is equivalent to infinity. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -1711,18 +1858,20 @@ limitations under the License. <value>true</value> <description>Set this to true if table directories should inherit the permissions of the warehouse or database directory instead of being created with permissions derived from dfs umask </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.start.cleanup.scratchdir</name> <value>true</value> <description>To cleanup the hive scratchdir while starting the hive server.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.authentication.ldap.url</name> <value> </value> - <property-type>DONT_ADD_ON_UPGRADE</property-type> + <on-ambari-upgrade add="false"/> <depends-on> <property> <type>hive-site</type> @@ -1732,7 +1881,7 @@ limitations under the License. </property> <property> <name>hive.server2.authentication.ldap.baseDN</name> - <property-type>DONT_ADD_ON_UPGRADE</property-type> + <on-ambari-upgrade add="false"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -1746,7 +1895,7 @@ limitations under the License. <property> <name>hive.server2.authentication.kerberos.keytab</name> <value>/etc/security/keytabs/hive.service.keytab</value> - <property-type>DONT_ADD_ON_UPGRADE</property-type> + <on-ambari-upgrade add="false"/> <depends-on> <property> <type>hive-site</type> @@ -1757,7 +1906,7 @@ limitations under the License. <property> <name>hive.server2.authentication.kerberos.principal</name> <value>hive/[email protected]</value> - <property-type>DONT_ADD_ON_UPGRADE</property-type> + <on-ambari-upgrade add="false"/> <depends-on> <property> <type>hive-site</type> @@ -1768,7 +1917,7 @@ limitations under the License. <property> <name>hive.server2.authentication.pam.services</name> <value></value> - <property-type>DONT_ADD_ON_UPGRADE</property-type> + <on-ambari-upgrade add="false"/> <depends-on> <property> <type>hive-site</type> @@ -1779,7 +1928,7 @@ limitations under the License. <property> <name>hive.server2.custom.authentication.class</name> <value></value> - <property-type>DONT_ADD_ON_UPGRADE</property-type> + <on-ambari-upgrade add="false"/> <depends-on> <property> <type>hive-site</type> @@ -1791,10 +1940,12 @@ limitations under the License. <property> <name>datanucleus.autoCreateSchema</name> <value>false</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>datanucleus.fixedDatastore</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> @@ -1805,5 +1956,6 @@ limitations under the License. External tables will be created with default file format. Leaving this null will result in using the default file format for all tables. </description> + <on-ambari-upgrade add="true"/> </property> </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml index 0b6686f..bf34fce 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hiveserver2-site.xml @@ -23,6 +23,7 @@ limitations under the License. <name>hive.security.authenticator.manager</name> <value>org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator</value> <description>Hive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -36,6 +37,7 @@ limitations under the License. <value>org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory</value> <description>the hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>hive-env</type> @@ -49,6 +51,7 @@ limitations under the License. <value>false</value> <description>enable or disable the Hive client authorization</description> <display-name>Enable Authorization</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml index c7945f3..316ebbe 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-audit.xml @@ -24,6 +24,7 @@ <name>xasecure.audit.is.enabled</name> <value>true</value> <description>Is Audit enabled?</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -31,6 +32,7 @@ <value>false</value> <display-name>Audit to DB</display-name> <description>Is Audit to DB enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -46,17 +48,20 @@ <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> <description>Audit DB JDBC URL</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> <description>Audit DB JDBC User</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Audit DB JDBC Password</description> </property> @@ -65,18 +70,21 @@ <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> <description>Audit DB JDBC Driver</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> <description>Credential file store</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hive/audit/db/spool</value> <description>/var/log/hive/audit/db/spool</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -84,6 +92,7 @@ <value>true</value> <display-name>Audit to HDFS</display-name> <description>Is Audit to HDFS enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -99,6 +108,7 @@ <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>ranger-env</type> @@ -111,6 +121,7 @@ <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hive/audit/hdfs/spool</value> <description>/var/log/hive/audit/hdfs/spool</description> + <on-ambari-upgrade add="true"/> </property> <!-- Removing auditing to Solr @@ -119,6 +130,7 @@ <value>false</value> <display-name>Audit to SOLR</display-name> <description>Is Solr audit enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -134,6 +146,7 @@ <name>xasecure.audit.destination.solr.urls</name> <value></value> <description>Solr URL</description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -149,6 +162,7 @@ <name>xasecure.audit.destination.solr.zookeepers</name> <value>NONE</value> <description>Solr Zookeeper string</description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>ranger-admin-site</type> @@ -161,6 +175,7 @@ <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/hive/audit/solr/spool</value> <description>/var/log/hive/audit/solr/spool</description> + <on-ambari-upgrade add="true"/> </property> --> @@ -169,6 +184,7 @@ <value>false</value> <display-name>Audit provider summary enabled</display-name> <description>Enable Summary audit?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml index 89c99a1..7cc6076 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml @@ -25,18 +25,21 @@ <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> + <on-ambari-upgrade add="true"/> </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"/> </property> <property> <name>common.name.for.certificate</name> <value></value> <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -47,12 +50,14 @@ <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"/> </property> <property> <name>REPOSITORY_CONFIG_PASSWORD</name> <value>hive</value> <display-name>Ranger repository config password</display-name> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Used for repository creation on ranger admin</description> </property> @@ -61,132 +66,158 @@ <property> <name>XAAUDIT.DB.IS_ENABLED</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.IS_ENABLED</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_FILE</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_KEYSTORE_FILE_PATH</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_KEYSTORE_PASSWORD</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_TRUSTSTORE_FILE_PATH</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>POLICY_MGR_URL</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SQL_CONNECTOR_JAR</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.FLAVOUR</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.DATABASE_NAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.USER_NAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.PASSWORD</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>REPOSITORY_NAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> --> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml index 581dad5..87541ce 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml @@ -24,11 +24,13 @@ <name>xasecure.policymgr.clientssl.keystore</name> <value>/usr/iop/current/hive-server2/conf/ranger-plugin-keystore.jks</value> <description>Java Keystore files</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.keystore.password</name> <value>myKeyFilePassword</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>password for keystore</description> </property> @@ -37,11 +39,13 @@ <name>xasecure.policymgr.clientssl.truststore</name> <value>/usr/iop/current/hive-server2/conf/ranger-plugin-truststore.jks</value> <description>java truststore file</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore.password</name> <value>changeit</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>java truststore password</description> </property> @@ -50,12 +54,14 @@ <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> <description>java keystore credential file</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> <description>java truststore credential file</description> + <on-ambari-upgrade add="true"/> </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml index 759173b..b78bda9 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/ranger-hive-security.xml @@ -24,36 +24,42 @@ <name>ranger.plugin.hive.service.name</name> <value>{{repo_name}}</value> <description>Name of the Ranger service containing policies for this Hive instance</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hive.policy.source.impl</name> <value>org.apache.ranger.admin.client.RangerAdminRESTClient</value> <description>Class to retrieve policies from the source</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hive.policy.rest.url</name> <value>{{policymgr_mgr_url}}</value> <description>URL to Ranger Admin</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hive.policy.rest.ssl.config.file</name> <value>/usr/iop/current/hive-server2/conf/conf.server/ranger-policymgr-ssl.xml</value> <description>Path to the file containing SSL details to contact Ranger Admin</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hive.policy.pollIntervalMs</name> <value>30000</value> <description>How often to poll for changes in policies?</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hive.policy.cache.dir</name> <value>/etc/ranger/{{repo_name}}/policycache</value> <description>Directory where Ranger policies are cached after successful retrieval from the source</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -61,6 +67,7 @@ <value>true</value> <display-name>Should Hive GRANT/REVOKE update XA policies</display-name> <description>Should Hive plugin update Ranger policies for updates to permissions done using GRANT/REVOKE?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml index efeebc6..5b509a1 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-env.xml @@ -49,6 +49,7 @@ CONSOLE_LOG={{templeton_log_dir}}/webhcat-console.log # Set HADOOP_HOME to point to a specific hadoop install directory export HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}} </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml index 6f1b21f..68cea1e 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-log4j.xml @@ -73,6 +73,7 @@ log4j.logger.org.apache.zookeeper = WARN log4j.logger.org.eclipse.jetty = INFO </value> + <on-ambari-upgrade add="true"/> <value-attributes> <show-property-name>false</show-property-name> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml index e35ff6f..7bb03c5 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/webhcat-site.xml @@ -27,36 +27,42 @@ limitations under the License. <name>templeton.port</name> <value>50111</value> <description>The HTTP port for the main server.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.hadoop.conf.dir</name> <value>/etc/hadoop/conf</value> <description>The path to the Hadoop configuration.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.jar</name> <value>/usr/iop/${iop.version}/hive/share/webhcat/svr/lib/hive-webhcat-*.jar</value> <description>The path to the Templeton jar file.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.libjars</name> <value>/usr/iop/${iop.version}/zookeeper/zookeeper.jar,/usr/iop/${iop.version}/hive/lib/hive-common.jar</value> <description>Jars to add the the classpath.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.hadoop</name> <value>/usr/iop/${iop.version}/hadoop/bin/hadoop</value> <description>The path to the Hadoop executable.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.pig.archive</name> <value>hdfs:///iop/apps/${iop.version}/pig/pig.tar.gz</value> <description>The path to the Pig archive in HDFS.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -66,18 +72,21 @@ limitations under the License. <name>templeton.pig.path</name> <value>/usr/iop/${iop.version}/pig/bin/pig</value> <description>The path to the Pig executable.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.hcat</name> <value>/usr/iop/${iop.version}/hive/bin/hcat</value> <description>The path to the hcatalog executable.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.hive.archive</name> <value>hdfs:///iop/apps/${iop.version}/hive/hive.tar.gz</value> <description>The path to the Hive archive.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -87,36 +96,42 @@ limitations under the License. <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"/> </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"/> </property> <property> <name>templeton.hive.path</name> <value>/usr/iop/${iop.version}/hive/bin/hive</value> <description>The path to the Hive executable.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.hive.properties</name> <value>hive.metastore.local=false,hive.metastore.uris=thrift://localhost:9083,hive.metastore.sasl.enabled=false</value> <description>Properties to set when running hive.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.sqoop.archive</name> <value>hdfs:///iop/apps/${iop.version}/sqoop/sqoop.tar.gz</value> <description>The path to the Sqoop archive in HDFS.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.sqoop.path</name> <value>/usr/iop/${iop.version}/sqoop/bin/sqoop</value> <description>The path to the Sqoop executable.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -125,12 +140,14 @@ limitations under the License. <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"/> </property> <property> <name>templeton.zookeeper.hosts</name> <value>localhost:2181</value> <description>ZooKeeper servers, as comma separated host:port pairs</description> + <on-ambari-upgrade add="false"/> <value-attributes> <type>multiLine</type> </value-attributes> @@ -140,24 +157,28 @@ limitations under the License. <name>templeton.storage.class</name> <value>org.apache.hive.hcatalog.templeton.tool.ZooKeeperStorage</value> <description>The class to use as storage</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.override.enabled</name> <value>false</value> <description>Enable the override path in templeton.override.jars</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.streaming.jar</name> <value>hdfs:///iop/apps/${iop.version}/mapreduce/hadoop-streaming.jar</value> <description>The hdfs path to the Hadoop streaming jar file.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>templeton.exec.timeout</name> <value>60000</value> <description>Time out for templeton api</description> + <on-ambari-upgrade add="true"/> </property> </configuration>
