http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-plugin-properties.xml deleted file mode 100755 index 346baa9..0000000 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-plugin-properties.xml +++ /dev/null @@ -1,63 +0,0 @@ -<configuration><property require-input="false"> - <name>policy_user</name> - <value>ambari-qa</value> - <description>This user must be system user and also present at Ranger admin portal</description> - <display-name>Policy user for HIVE</display-name> - <filename>ranger-hive-plugin-properties.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>jdbc.driverClassName</name> - <value>org.apache.hive.jdbc.HiveDriver</value> - <description>Used for repository creation on ranger admin</description> - <filename>ranger-hive-plugin-properties.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <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> - <filename>ranger-hive-plugin-properties.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes> - <empty-value-valid>true</empty-value-valid> - </value-attributes> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>REPOSITORY_CONFIG_USERNAME</name> - <value>hive</value> - <description>Used for repository creation on ranger admin</description> - <display-name>Ranger repository config user</display-name> - <filename>ranger-hive-plugin-properties.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>REPOSITORY_CONFIG_PASSWORD</name> - <value>hive</value> - <description>Used for repository creation on ranger admin</description> - <display-name>Ranger repository config password</display-name> - <filename>ranger-hive-plugin-properties.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type>PASSWORD</property-type> - <value-attributes> - <type>password</type> - </value-attributes> - <depends-on/> - <property_depended_by/> -</property></configuration> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml deleted file mode 100755 index bf73d9f..0000000 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml +++ /dev/null @@ -1,71 +0,0 @@ -<configuration><property require-input="false"> - <name>xasecure.policymgr.clientssl.keystore</name> - <value>/usr/hdp/current/hive-server2/conf/ranger-plugin-keystore.jks</value> - <description>Java Keystore files</description> - <filename>ranger-hive-policymgr-ssl.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>xasecure.policymgr.clientssl.keystore.password</name> - <value>myKeyFilePassword</value> - <description>password for keystore</description> - <filename>ranger-hive-policymgr-ssl.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type>PASSWORD</property-type> - <value-attributes> - <type>password</type> - </value-attributes> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>xasecure.policymgr.clientssl.truststore</name> - <value>/usr/hdp/current/hive-server2/conf/ranger-plugin-truststore.jks</value> - <description>java truststore file</description> - <filename>ranger-hive-policymgr-ssl.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>xasecure.policymgr.clientssl.truststore.password</name> - <value>changeit</value> - <description>java truststore password</description> - <filename>ranger-hive-policymgr-ssl.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type>PASSWORD</property-type> - <value-attributes> - <type>password</type> - </value-attributes> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>xasecure.policymgr.clientssl.keystore.credential.file</name> - <value>jceks://file{{credential_file}}</value> - <description>java keystore credential file</description> - <filename>ranger-hive-policymgr-ssl.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>xasecure.policymgr.clientssl.truststore.credential.file</name> - <value>jceks://file{{credential_file}}</value> - <description>java truststore credential file</description> - <filename>ranger-hive-policymgr-ssl.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property></configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-security.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-security.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-security.xml deleted file mode 100755 index a29780f..0000000 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/ranger-hive-security.xml +++ /dev/null @@ -1,81 +0,0 @@ -<configuration><property require-input="false"> - <name>ranger.plugin.hive.policy.rest.ssl.config.file</name> - <value>/usr/hdp/current/{{ranger_hive_component}}/conf/conf.server/ranger-policymgr-ssl.xml</value> - <description>Path to the file containing SSL details to contact Ranger Admin</description> - <filename>ranger-hive-security.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>ranger.plugin.hive.service.name</name> - <value>{{repo_name}}</value> - <description>Name of the Ranger service containing policies for this HIVE instance</description> - <filename>ranger-hive-security.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <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> - <filename>ranger-hive-security.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>ranger.plugin.hive.policy.rest.url</name> - <value>{{policymgr_mgr_url}}</value> - <description>URL to Ranger Admin</description> - <filename>ranger-hive-security.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>ranger.plugin.hive.policy.pollIntervalMs</name> - <value>30000</value> - <description>How often to poll for changes in policies?</description> - <filename>ranger-hive-security.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <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> - <filename>ranger-hive-security.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>xasecure.hive.update.xapolicies.on.grant.revoke</name> - <value>true</value> - <description>Should Hive plugin update Ranger policies for updates to permissions done using GRANT/REVOKE?</description> - <display-name>Should Hive GRANT/REVOKE update XA policies</display-name> - <filename>ranger-hive-security.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes> - <type>boolean</type> - </value-attributes> - <depends-on/> - <property_depended_by/> -</property></configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/tez-interactive-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/tez-interactive-site.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/tez-interactive-site.xml deleted file mode 100755 index 3865c36..0000000 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/configuration/tez-interactive-site.xml +++ /dev/null @@ -1,144 +0,0 @@ -<configuration><property require-input="false"> - <name>tez.runtime.shuffle.fetch.buffer.percent</name> - <value>0.6</value> - <description>Fraction (0-1) of the available memory which can be used to - retain shuffled data</description> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.runtime.shuffle.memory.limit.percent</name> - <value>0.25</value> - <description>This property determines the maximum size of a shuffle segment - which can be fetched to memory. Fraction (0-1) of shuffle memory - (after applying tez.runtime.shuffle.fetch.buffer.percent)</description> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.runtime.report.partition.stats</name> - <value>true</value> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.runtime.pipelined-shuffle.enabled</name> - <value>false</value> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.runtime.pipelined.sorter.lazy-allocate.memory</name> - <value>true</value> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.grouping.node.local.only</name> - <value>true</value> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.runtime.shuffle.fetch.verify-disk-checksum</name> - <value>false</value> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.lib.uris</name> - <value>/hdp/apps/${hdp.version}/tez_hive2/tez.tar.gz</value> - <description>Comma-delimited list of the location of the Tez libraries which will be localized for DAGs. - Specifying a single .tar.gz or .tgz assumes that a compressed version of the tez libs is being used. This is uncompressed into a tezlibs directory when running containers, and tezlibs/;tezlibs/lib/ are added to the classpath (after . and .*). - If multiple files are specified - files are localized as regular files, contents of directories are localized as regular files (non-recursive). - </description> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.dag.recovery.enabled</name> - <value>false</value> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="false" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.am.resource.memory.mb</name> - <value>1536</value> - <description>The amount of memory to be used by the AppMaster</description> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes> - <type>int</type> - </value-attributes> - <depends-on> - <property> - <name>yarn.scheduler.capacity.root.queues</name> - <type>capacity-scheduler</type> - </property> - <property> - <name>hive.llap.daemon.queue.name</name> - <type>hive-interactive-site</type> - </property> - <property> - <name>llap_queue_capacity</name> - <type>hive-interactive-env</type> - </property> - <property> - <name>enable_hive_interactive</name> - <type>hive-interactive-env</type> - </property> - <property> - <name>hive.server2.tez.sessions.per.default.queue</name> - <type>hive-interactive-site</type> - </property> - </depends-on> - <property_depended_by/> -</property><property require-input="false"> - <name>tez.session.am.dag.submit.timeout.secs</name> - <value>3600</value> - <filename>tez-interactive-site.xml</filename> - <deleted>false</deleted> - <on-ambari-upgrade add="true" delete="false" update="false"/> - <property-type></property-type> - <value-attributes/> - <depends-on/> - <property_depended_by/> -</property></configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/metainfo.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/metainfo.xml index d6ecbed..9e73118 100755 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/metainfo.xml +++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/metainfo.xml @@ -3,7 +3,7 @@ <services><service> <name>HIVE</name> <displayName>Hive</displayName> - <version>1.2.1</version> + <version>1.2.1+odpi</version> <comment>Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service</comment> <components> <component> @@ -12,7 +12,7 @@ <category>CLIENT</category> <deleted>false</deleted> <cardinality>0+</cardinality> - <versionAdvertised>true</versionAdvertised> + <versionAdvertised>false</versionAdvertised> <versionAdvertisedInternal>false</versionAdvertisedInternal> <commandScript> <script>scripts/hcat_client.py</script> @@ -37,7 +37,7 @@ <category>MASTER</category> <deleted>false</deleted> <cardinality>1+</cardinality> - <versionAdvertisedInternal>true</versionAdvertisedInternal> + <versionAdvertisedInternal>false</versionAdvertisedInternal> <commandScript> <script>scripts/hive_server.py</script> <scriptType>PYTHON</scriptType> @@ -108,7 +108,7 @@ <category>CLIENT</category> <deleted>false</deleted> <cardinality>1+</cardinality> - <versionAdvertised>true</versionAdvertised> + <versionAdvertised>false</versionAdvertised> <versionAdvertisedInternal>false</versionAdvertisedInternal> <commandScript> <script>scripts/hive_client.py</script> @@ -148,7 +148,7 @@ <category>MASTER</category> <deleted>false</deleted> <cardinality>1+</cardinality> - <versionAdvertisedInternal>true</versionAdvertisedInternal> + <versionAdvertisedInternal>false</versionAdvertisedInternal> <commandScript> <script>scripts/webhcat_server.py</script> <scriptType>PYTHON</scriptType> @@ -272,7 +272,7 @@ <category>MASTER</category> <deleted>false</deleted> <cardinality>1+</cardinality> - <versionAdvertisedInternal>true</versionAdvertisedInternal> + <versionAdvertisedInternal>false</versionAdvertisedInternal> <commandScript> <script>scripts/hive_metastore.py</script> <scriptType>PYTHON</scriptType> @@ -295,149 +295,8 @@ <recovery_enabled>false</recovery_enabled> <reassignAllowed>true</reassignAllowed> </component> - <component> - <name>HIVE_SERVER_INTERACTIVE</name> - <displayName>HiveServer2 Interactive</displayName> - <category>MASTER</category> - <deleted>false</deleted> - <cardinality>0-1</cardinality> - <versionAdvertised>true</versionAdvertised> - <versionAdvertisedInternal>false</versionAdvertisedInternal> - <commandScript> - <script>scripts/hive_server_interactive.py</script> - <scriptType>PYTHON</scriptType> - <timeout>0</timeout> - </commandScript> - <customCommands> - <customCommand> - <name>RESTART_LLAP</name> - <commandScript> - <script>scripts/hive_server_interactive.py</script> - <scriptType>PYTHON</scriptType> - <timeout>600</timeout> - </commandScript> - <background>false</background> - </customCommand> - </customCommands> - <dependencies> - <dependency> - <auto-deploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </auto-deploy> - <autoDeploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </autoDeploy> - <name>ZOOKEEPER/ZOOKEEPER_SERVER</name> - <scope>cluster</scope> - </dependency> - <dependency> - <auto-deploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </auto-deploy> - <autoDeploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </autoDeploy> - <name>YARN/YARN_CLIENT</name> - <scope>host</scope> - </dependency> - <dependency> - <auto-deploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </auto-deploy> - <autoDeploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </autoDeploy> - <name>HDFS/HDFS_CLIENT</name> - <scope>host</scope> - </dependency> - <dependency> - <auto-deploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </auto-deploy> - <autoDeploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </autoDeploy> - <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name> - <scope>host</scope> - </dependency> - <dependency> - <auto-deploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </auto-deploy> - <autoDeploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </autoDeploy> - <name>TEZ/TEZ_CLIENT</name> - <scope>host</scope> - </dependency> - <dependency> - <auto-deploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </auto-deploy> - <autoDeploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </autoDeploy> - <name>PIG/PIG</name> - <scope>host</scope> - </dependency> - <dependency> - <auto-deploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </auto-deploy> - <autoDeploy> - <co-locate>HIVE/HIVE_SERVER_INTERACTIVE</co-locate> - <coLocate>HIVE/HIVE_SERVER_INTERACTIVE</coLocate> - <enabled>true</enabled> - </autoDeploy> - <name>SLIDER/SLIDER</name> - <scope>host</scope> - </dependency> - </dependencies> - <configuration-dependencies> - <config-type>beeline-log4j2</config-type> - <config-type>hive-exec-log4j2</config-type> - <config-type>hive-log4j2</config-type> - <config-type>hive-site</config-type> - <config-type>hive-interactive-site</config-type> - <config-type>tez-interactive-site</config-type> - <config-type>hiveserver2-interactive-site</config-type> - <config-type>hive-interactive-env</config-type> - <config-type>llap-cli-log4j2</config-type> - <config-type>llap-daemon-log4j</config-type> - </configuration-dependencies> - <recovery_enabled>false</recovery_enabled> - </component> </components> - <deleted>false</deleted> <configuration-dependencies> - <config-type>application-properties</config-type> - <config-type>hive-atlas-application.properties</config-type> <config-type>hive-log4j</config-type> <config-type>hive-exec-log4j</config-type> <config-type>tez-site</config-type> @@ -445,12 +304,7 @@ <config-type>hivemetastore-site.xml</config-type> <config-type>webhcat-site</config-type> <config-type>webhcat-env</config-type> - <config-type>ranger-hive-plugin-properties</config-type> - <config-type>ranger-hive-audit</config-type> - <config-type>ranger-hive-policymgr-ssl</config-type> - <config-type>ranger-hive-security</config-type> <config-type>mapred-site</config-type> - <config-type>application.properties</config-type> </configuration-dependencies> <widgetsFileName>widgets.json</widgetsFileName> <metricsFileName>metrics.json</metricsFileName> http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py index 1cd58c3..b33d715 100755 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py +++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py @@ -93,12 +93,18 @@ stack_supports_ranger_audit_db = check_stack_feature(StackFeature.RANGER_AUDIT_D component_directory = status_params.component_directory component_directory_interactive = status_params.component_directory_interactive -hadoop_home = format('{stack_root}/current/hadoop-client') -hive_bin = format('{stack_root}/current/{component_directory}/bin') -hive_schematool_ver_bin = format('{stack_root}/{version}/hive/bin') -hive_schematool_bin = format('{stack_root}/current/{component_directory}/bin') -hive_lib = format('{stack_root}/current/{component_directory}/lib') -hive_version_lib = format('{stack_root}/{version}/hive/lib') +hadoop_home = '/usr/lib/hadoop' +hive_bin = '/usr/lib/hive/bin' +hive_schematool_ver_bin = '/usr/lib/hive/bin' +hive_schematool_bin = '/usr/lib/hive/bin' +hive_lib = '/usr/lib/hive/lib' +hive_version_lib = '/usr/lib/hive/lib' +#hadoop_home = format('{stack_root}/current/hadoop-client') +#hive_bin = format('{stack_root}/current/{component_directory}/bin') +#hive_schematool_ver_bin = format('{stack_root}/{version}/hive/bin') +#hive_schematool_bin = format('{stack_root}/current/{component_directory}/bin') +#hive_lib = format('{stack_root}/current/{component_directory}/lib') +#hive_version_lib = format('{stack_root}/{version}/hive/lib') hive_var_lib = '/var/lib/hive' hive_user_home_dir = "/home/hive" @@ -167,10 +173,6 @@ config_dir = '/etc/hive-webhcat/conf' hcat_lib = '/usr/lib/hive-hcatalog/share/hcatalog' webhcat_bin_dir = '/usr/lib/hive-hcatalog/sbin' -# there are no client versions of these, use server versions directly -hcat_lib = format('{stack_root}/current/hive-webhcat/share/hcatalog') -webhcat_bin_dir = format('{stack_root}/current/hive-webhcat/sbin') - # --- Tarballs --- # DON'T CHANGE THESE VARIABLE NAMES # Values don't change from those in copy_tarball.py @@ -189,17 +191,14 @@ tarballs_mode = 0444 purge_tables = "false" # Starting from stack version for feature hive_purge_table drop should be executed with purge -if check_stack_feature(StackFeature.HIVE_PURGE_TABLE, version_for_stack_feature_checks): - purge_tables = 'true' +purge_tables = 'true' -if check_stack_feature(StackFeature.HIVE_WEBHCAT_SPECIFIC_CONFIGS, version_for_stack_feature_checks): - # this is NOT a typo. Configs for hcatalog/webhcat point to a - # specific directory which is NOT called 'conf' - hcat_conf_dir = format('{stack_root}/current/hive-webhcat/etc/hcatalog') - config_dir = format('{stack_root}/current/hive-webhcat/etc/webhcat') +# this is NOT a typo. Configs for hcatalog/webhcat point to a +# specific directory which is NOT called 'conf' +hcat_conf_dir = format('{stack_root}/current/hive-webhcat/etc/hcatalog') +config_dir = format('{stack_root}/current/hive-webhcat/etc/webhcat') -if check_stack_feature(StackFeature.HIVE_METASTORE_SITE_SUPPORT, version_for_stack_feature_checks): - hive_metastore_site_supported = True +hive_metastore_site_supported = True execute_path = os.environ['PATH'] + os.pathsep + hive_bin + os.pathsep + hadoop_bin_dir @@ -395,10 +394,7 @@ start_metastore_path = format("{tmp_dir}/start_metastore_script") hadoop_heapsize = config['configurations']['hadoop-env']['hadoop_heapsize'] if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE"]: - if check_stack_feature(StackFeature.HIVE_ENV_HEAPSIZE, version_for_stack_feature_checks): - hive_heapsize = config['configurations']['hive-env']['hive.heapsize'] - else: - hive_heapsize = config['configurations']['hive-site']['hive.heapsize'] + hive_heapsize = config['configurations']['hive-env']['hive.heapsize'] else: hive_heapsize = config['configurations']['hive-env']['hive.client.heapsize'] http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py index b7cb148..024f3df 100755 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py +++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py @@ -92,10 +92,14 @@ else: hive_server_conf_dir = "/etc/hive/conf.server" hive_server_interactive_conf_dir = "/etc/hive2/conf.server" - webhcat_conf_dir = format("{stack_root}/current/hive-webhcat/conf") - hive_home_dir = format("{stack_root}/current/{component_directory}") - hive_conf_dir = format("{stack_root}/current/{component_directory}/conf") - hive_client_conf_dir = format("{stack_root}/current/{component_directory}/conf") +# webhcat_conf_dir = format("{stack_root}/current/hive-webhcat/conf") +# hive_home_dir = format("{stack_root}/current/{component_directory}") +# hive_conf_dir = format("{stack_root}/current/{component_directory}/conf") +# hive_client_conf_dir = format("{stack_root}/current/{component_directory}/conf") + webhcat_conf_dir = '/etc/hive/conf' + hive_home_dir = '/usr/lib/hive' + hive_conf_dir = '/usr/lib/hive/conf' + hive_client_conf_dir = '/etc/hive/conf' if check_stack_feature(StackFeature.CONFIG_VERSIONING, stack_version_formatted_major): hive_server_conf_dir = format("{stack_root}/current/{component_directory}/conf/conf.server") @@ -115,4 +119,4 @@ else: if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE", "HIVE_SERVER_INTERACTIVE"]: hive_config_dir = hive_server_conf_dir -stack_name = default("/hostLevelParams/stack_name", None) \ No newline at end of file +stack_name = default("/hostLevelParams/stack_name", None) http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/configuration/yarn-site.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/configuration/yarn-site.xml index b20114c..59ff82b 100755 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/configuration/yarn-site.xml +++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/configuration/yarn-site.xml @@ -19,13 +19,6 @@ <!-- Put site-specific property overrides in this file. --> <configuration xmlns:xi="http://www.w3.org/2001/XInclude"; supports_final="true"> <property> - <name>yarn.timeline-service.leveldb-timeline-store.path</name> - <value>/tmp/dummy</value> - <description>This is a temporary workaround for ODPI-186</description> - </property> - - <!-- ResourceManager --> - <property> <name>yarn.resourcemanager.hostname</name> <value>localhost</value> <description>The hostname of the RM.</description> @@ -113,25 +106,6 @@ <on-ambari-upgrade add="true"/> </property> <property> - <name>yarn.acl.enable</name> - <value>false</value> - <description> Are acls enabled. </description> - <value-attributes> - <type>boolean</type> - </value-attributes> - <on-ambari-upgrade add="true"/> - </property> - <property> - <name>yarn.admin.acl</name> - <value/> - <description> ACL of who can be admin of the YARN cluster. </description> - <value-attributes> - <empty-value-valid>true</empty-value-valid> - </value-attributes> - <on-ambari-upgrade add="true"/> - </property> - <!-- NodeManager --> - <property> <name>yarn.nodemanager.address</name> <value>0.0.0.0:45454</value> <description>The address of the container manager in the NM.</description> @@ -421,4 +395,185 @@ </description> <on-ambari-upgrade add="true"/> </property> +==================== + <property> + <name>yarn.timeline-service.enabled</name> + <value>true</value> + <description>Indicate to clients whether timeline service is enabled or not. + If enabled, clients will put entities and events to the timeline server. + </description> + <value-attributes> + <type>boolean</type> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.generic-application-history.store-class</name> + <value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore</value> + <description> + Store class name for history store, defaulting to file system store + </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.leveldb-timeline-store.path</name> + <value>/var/log/hadoop-yarn/timeline</value> + <description> + Store file name for leveldb timeline store + </description> + <value-attributes> + <type>directory</type> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.webapp.address</name> + <value>localhost:8188</value> + <description> + The http address of the timeline service web application. + </description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.timeline-service.webapp.https.address</name> + <value>localhost:8190</value> + <description> + The http address of the timeline service web application. + </description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.timeline-service.address</name> + <value>localhost:10200</value> + <description> + This is default address for the timeline server to start + the RPC server. + </description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <description>Enable age off of timeline store data.</description> + <name>yarn.timeline-service.ttl-enable</name> + <value>true</value> + <value-attributes> + <type>boolean</type> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + <property> + <description>Time to live for timeline store data in milliseconds.</description> + <name>yarn.timeline-service.ttl-ms</name> + <value>2678400000</value> + <value-attributes> + <type>int</type> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + <property> + <description>Length of time to wait between deletion cycles of leveldb timeline store in milliseconds.</description> + <name>yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms</name> + <value>300000</value> + <value-attributes> + <type>int</type> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> +============================= + <property> + <name>yarn.timeline-service.recovery.enabled</name> + <description> + Enable timeline server to recover state after starting. If + true, then yarn.timeline-service.state-store-class must be specified. + </description> + <value>true</value> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.acl.enable</name> + <value>false</value> + <description> Are acls enabled. </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.authorization-provider</name> + <description> Yarn authorization provider class. </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.admin.acl</name> + <value>yarn</value> + <description> ACL of who can be admin of the YARN cluster. </description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + <!--ats v1.5 properties--> + <property> + <name>yarn.timeline-service.store-class</name> + <value>org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore</value> + <description>Main storage class for YARN timeline server.</description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.active-dir</name> + <value>/ats/active/</value> + <description>DFS path to store active application’s timeline data</description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.done-dir</name> + <value>/ats/done/</value> + <description>DFS path to store done application’s timeline data</description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes</name> + <value/> + <description>Plugins that can translate a timeline entity read request into a list of timeline cache ids, separated by commas. </description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> + <!-- advanced ats v1.5 properties--> + <property> + <name>yarn.timeline-service.entity-group-fs-store.summary-store</name> + <description>Summary storage for ATS v1.5</description> + <!-- Use rolling leveldb, advanced --> + <value>org.apache.hadoop.yarn.server.timeline.RollingLevelDBTimelineStore</value> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.scan-interval-seconds</name> + <description> + Scan interval for ATS v1.5 entity group file system storage reader.This + value controls how frequent the reader will scan the HDFS active directory + for application status. + </description> + <!-- Default is 60 seconds, advanced --> + <value>60</value> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.cleaner-interval-seconds</name> + <description> + Scan interval for ATS v1.5 entity group file system storage cleaner.This + value controls how frequent the reader will scan the HDFS done directory + for stale application data. + </description> + <!-- 3600 is default, advanced --> + <value>3600</value> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>yarn.timeline-service.entity-group-fs-store.retain-seconds</name> + <description> + How long the ATS v1.5 entity group file system storage will keep an + application's data in the done directory. + </description> + <!-- 7 days is default, advanced --> + <value>604800</value> + <on-ambari-upgrade add="true"/> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/bigtop/blob/623e0332/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/metainfo.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/metainfo.xml b/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/metainfo.xml index 18117f3..35da7fd 100755 --- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/metainfo.xml +++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/YARN/metainfo.xml @@ -26,6 +26,20 @@ <version>2.7.1+odpi</version> <components> + <component> + <name>APP_TIMELINE_SERVER</name> + <displayName>App Timeline Server</displayName> + <category>MASTER</category> + <cardinality>0-1</cardinality> + <versionAdvertised>true</versionAdvertised> + <reassignAllowed>true</reassignAllowed> + <commandScript> + <script>scripts/application_timeline_server.py</script> + <scriptType>PYTHON</scriptType> + <timeout>1200</timeout> + </commandScript> + </component> + <component> <name>RESOURCEMANAGER</name> <displayName>ResourceManager</displayName>
