You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/01/06 22:54:53 UTC
ambari git commit: AMBARI-19095. HDP 3.0 flatten Role Command Order
and update service versions in metainfo.xml (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk e7c027c96 -> 22187afc6
AMBARI-19095. HDP 3.0 flatten Role Command Order and update service versions in metainfo.xml (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22187afc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22187afc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22187afc
Branch: refs/heads/trunk
Commit: 22187afc6074e4f21f43984f3f270474cf9200dc
Parents: e7c027c
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Mon Dec 5 17:08:40 2016 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Fri Jan 6 14:54:36 2017 -0800
----------------------------------------------------------------------
.../configuration/ranger-hdfs-audit.xml | 94 ------------
.../ranger-hdfs-plugin-properties.xml | 18 +--
.../YARN/3.0.0.3.0/configuration/yarn-site.xml | 12 --
.../stacks/HDP/3.0/role_command_order.json | 149 +++++++++++++++++++
4 files changed, 152 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/22187afc/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-audit.xml
index fd41817..731b136 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-audit.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-audit.xml
@@ -28,62 +28,6 @@
<on-ambari-upgrade add="false"/>
</property>
<property>
- <name>xasecure.audit.destination.db</name>
- <value>false</value>
- <display-name>Audit to DB</display-name>
- <description>Is Audit to DB enabled?</description>
- <value-attributes>
- <type>boolean</type>
- </value-attributes>
- <depends-on>
- <property>
- <type>ranger-env</type>
- <name>xasecure.audit.destination.db</name>
- </property>
- </depends-on>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.jdbc.url</name>
- <value>{{audit_jdbc_url}}</value>
- <description>Audit DB JDBC URL</description>
- <on-ambari-upgrade add="false"/>
- </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="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.password</name>
- <value>crypted</value>
- <property-type>PASSWORD</property-type>
- <description>Audit DB JDBC Password</description>
- <value-attributes>
- <type>password</type>
- </value-attributes>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.jdbc.driver</name>
- <value>{{jdbc_driver}}</value>
- <description>Audit DB JDBC Driver</description>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.credential.provider.file</name>
- <value>jceks://file{{credential_file}}</value>
- <description>Credential file store</description>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.batch.filespool.dir</name>
- <value>/var/log/hadoop/hdfs/audit/db/spool</value>
- <description>/var/log/hadoop/hdfs/audit/db/spool</description>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
<name>xasecure.audit.destination.hdfs</name>
<value>true</value>
<display-name>Audit to HDFS</display-name>
@@ -176,42 +120,4 @@
</value-attributes>
<on-ambari-upgrade add="false"/>
</property>
-
- <!-- These configs are deleted in HDP 2.5. -->
- <property>
- <name>xasecure.audit.destination.db</name>
- <deleted>true</deleted>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.jdbc.url</name>
- <deleted>true</deleted>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.user</name>
- <deleted>true</deleted>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.password</name>
- <deleted>true</deleted>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.jdbc.driver</name>
- <deleted>true</deleted>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.credential.provider.file</name>
- <deleted>true</deleted>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
- <name>xasecure.audit.destination.db.batch.filespool.dir</name>
- <deleted>true</deleted>
- <on-ambari-upgrade add="false"/>
- </property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/22187afc/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-plugin-properties.xml
index b31742c..eb7e0bb 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-plugin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/ranger-hdfs-plugin-properties.xml
@@ -30,13 +30,12 @@
</property>
<property>
<name>hadoop.rpc.protection</name>
- <value/>
- <description>Used for repository creation on ranger admin
- </description>
+ <value>authentication</value>
+ <description>Used for repository creation on ranger admin</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false"/>
+ <on-ambari-upgrade add="false" />
</property>
<property>
<name>common.name.for.certificate</name>
@@ -84,15 +83,4 @@
</value-attributes>
<on-ambari-upgrade add="false"/>
</property>
-
- <!-- These configs were inherited from HDP 2.5 -->
- <property>
- <name>hadoop.rpc.protection</name>
- <value>authentication</value>
- <description>Used for repository creation on ranger admin</description>
- <value-attributes>
- <empty-value-valid>true</empty-value-valid>
- </value-attributes>
- <on-ambari-upgrade add="false" />
- </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/22187afc/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml
index 01c3b47..4f30cb9 100644
--- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml
@@ -173,12 +173,6 @@
<on-ambari-upgrade add="true"/>
</property>
<property>
- <name>yarn.nodemanager.container-executor.class</name>
- <value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value>
- <description>ContainerExecutor for launching containers</description>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
<name>yarn.nodemanager.linux-container-executor.group</name>
<value>hadoop</value>
<description>Unix group of the NodeManager</description>
@@ -1122,12 +1116,6 @@ yarn.node-labels.manager-class
<!-- These configs were inherited from HDP 2.5 -->
<property>
- <name>yarn.nodemanager.aux-services</name>
- <value>mapreduce_shuffle,spark_shuffle,spark2_shuffle</value>
- <description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and cannot start with numbers</description>
- <on-ambari-upgrade add="false"/>
- </property>
- <property>
<name>yarn.nodemanager.aux-services.spark2_shuffle.class</name>
<value>org.apache.spark.network.yarn.YarnShuffleService</value>
<description>The auxiliary service class to use for Spark 2</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/22187afc/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
new file mode 100644
index 0000000..ee7a892
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
@@ -0,0 +1,149 @@
+{
+ "_comment" : "Record format:",
+ "_comment" : "blockedRole-blockedCommand: [blockerRole1-blockerCommand1, blockerRole2-blockerCommand2, ...]",
+ "general_deps" : {
+ "_comment" : "dependencies for all cases",
+ "APP_TIMELINE_SERVER-RESTART": ["NAMENODE-RESTART"],
+
+ "ACCUMULO_MASTER-START": ["ZOOKEEPER_SERVER-START", "NAMENODE-START", "DATANODE-START"],
+ "ACCUMULO_TSERVER-START": ["ACCUMULO_MASTER-START"],
+ "ACCUMULO_MONITOR-START": ["ACCUMULO_MASTER-START"],
+ "ACCUMULO_GC-START": ["ACCUMULO_MASTER-START"],
+ "ACCUMULO_TRACER-START": ["ACCUMULO_MASTER-START", "ACCUMULO_TSERVER-START"],
+ "ACCUMULO_MONITOR-STOP" : ["ACCUMULO_MASTER-STOP"],
+ "ACCUMULO_MASTER-STOP" : ["ACCUMULO_TSERVER-STOP"],
+ "ACCUMULO_TSERVER-STOP" : ["ACCUMULO_TRACER-STOP", "ACCUMULO_GC-STOP"],
+ "ACCUMULO_SERVICE_CHECK-SERVICE_CHECK": ["ACCUMULO_MASTER-START", "ACCUMULO_TSERVER-START", "ACCUMULO_TRACER-START"],
+
+ "DRPC_SERVER-START" : ["NIMBUS-START"],
+
+ "DRUID_HISTORICAL-START" : ["ZOOKEEPER_SERVER-START", "NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START", "NODEMANAGER-START"],
+ "DRUID_OVERLORD-START" : ["ZOOKEEPER_SERVER-START", "NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START", "NODEMANAGER-START"],
+ "DRUID_MIDDLEMANAGER-START" : ["ZOOKEEPER_SERVER-START", "NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START", "NODEMANAGER-START"],
+ "DRUID_BROKER-START" : ["ZOOKEEPER_SERVER-START", "NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START", "NODEMANAGER-START"],
+ "DRUID_ROUTER-START" : ["ZOOKEEPER_SERVER-START", "NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START", "NODEMANAGER-START"],
+ "DRUID_COORDINATOR-START" : ["ZOOKEEPER_SERVER-START", "NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START", "NODEMANAGER-START"],
+ "DRUID_OVERLORD-RESTART" : ["DRUID_HISTORICAL-RESTART"],
+ "DRUID_MIDDLEMANAGER-RESTART" : ["DRUID_OVERLORD-RESTART"],
+ "DRUID_BROKER-RESTART" : ["DRUID_MIDDLEMANAGER-RESTART"],
+ "DRUID_ROUTER-RESTART" : ["DRUID_BROKER-RESTART"],
+ "DRUID_COORDINATOR-RESTART" : ["DRUID_ROUTER-RESTART"],
+ "DRUID_SERVICE_CHECK-SERVICE_CHECK" : ["DRUID_HISTORICAL-START", "DRUID_COORDINATOR-START", "DRUID_OVERLORD-START", "DRUID_MIDDLEMANAGER-START", "DRUID_BROKER-START", "DRUID_ROUTER-START"],
+
+ "FALCON_SERVER-START": ["OOZIE_SERVER-START"],
+ "FALCON_SERVICE_CHECK-SERVICE_CHECK": ["FALCON_SERVER-START"],
+
+ "FLUME_HANDLER-START": ["OOZIE_SERVER-START"],
+ "FLUME_SERVICE_CHECK-SERVICE_CHECK": ["FLUME_HANDLER-START"],
+
+ "HAWQSEGMENT-START" : ["HAWQMASTER-START", "HAWQSTANDBY-START"],
+ "HAWQSEGMENT-RESTART" : ["HAWQMASTER-RESTART", "HAWQSTANDBY-RESTART"],
+ "HAWQMASTER-START" : ["NAMENODE-START", "DATANODE-START", "NODEMANAGER-START"],
+ "HAWQSTANDBY-START" : ["HAWQMASTER-START"],
+ "HAWQSTANDBY-RESTART" : ["HAWQMASTER-RESTART"],
+ "HAWQ_SERVICE_CHECK-SERVICE_CHECK" : ["HAWQSEGMENT-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK", "YARN_SERVICE_CHECK-SERVICE_CHECK", "PXF_SERVICE_CHECK-SERVICE_CHECK"],
+
+ "HBASE_MASTER-START": ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"],
+ "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"],
+ "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
+ "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"],
+
+ "HIVE_METASTORE-START": ["MYSQL_SERVER-START", "NAMENODE-START"],
+ "HIVE_METASTORE-RESTART": ["MYSQL_SERVER-RESTART", "NAMENODE-RESTART"],
+ "HIVE_SERVER-START": ["NODEMANAGER-START", "MYSQL_SERVER-START", "RANGER_USERSYNC-START", "ZOOKEEPER_SERVER-START"],
+ "HIVE_SERVER-RESTART": ["NODEMANAGER-RESTART", "MYSQL_SERVER-RESTART", "ZOOKEEPER_SERVER-RESTART"],
+ "HIVE_SERVER_INTERACTIVE-START": ["RESOURCEMANAGER-START", "NODEMANAGER-START", "MYSQL_SERVER-START"],
+ "HIVE_SERVER_INTERACTIVE-RESTART": ["NODEMANAGER-RESTART", "MYSQL_SERVER-RESTART"],
+ "HIVE_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START", "HIVE_METASTORE-START", "WEBHCAT_SERVER-START", "HIVE_SERVER_INTERACTIVE-START"],
+
+ "KAFKA_BROKER-START" : ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "NAMENODE-START"],
+ "KAFKA_SERVICE_CHECK-SERVICE_CHECK": ["KAFKA_BROKER-START"],
+
+ "KNOX_GATEWAY-START" : ["RANGER_USERSYNC-START", "NAMENODE-START"],
+ "KNOX_SERVICE_CHECK-SERVICE_CHECK" : ["KNOX_GATEWAY-START"],
+
+ "LIVY_SERVER-START" : ["NAMENODE-START", "DATANODE-START", "APP_TIMELINE_SERVER-START"],
+ "LIVY2_SERVER-START" : ["NAMENODE-START", "DATANODE-START", "APP_TIMELINE_SERVER-START"],
+
+ "MAHOUT_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
+
+ "MAPREDUCE_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
+
+ "NAMENODE-STOP": ["HIVE_SERVER_INTERACTIVE-STOP"],
+
+ "NIMBUS-START" : ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "NAMENODE-START"],
+ "NIMBUS-STOP" : ["SUPERVISOR-STOP", "STORM_UI_SERVER-STOP", "DRPC_SERVER-STOP"],
+
+ "NODEMANAGER-STOP": ["HIVE_SERVER_INTERACTIVE-STOP"],
+
+ "OOZIE_SERVER-START": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
+ "OOZIE_SERVICE_CHECK-SERVICE_CHECK": ["OOZIE_SERVER-START", "MAPREDUCE2_SERVICE_CHECK-SERVICE_CHECK"],
+
+ "PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-START"],
+
+ "PIG_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
+
+ "PXF-START" : ["NAMENODE-START", "DATANODE-START"],
+ "PXF_SERVICE_CHECK-SERVICE_CHECK" : ["PXF-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK", "HBASE_SERVICE_CHECK-SERVICE_CHECK", "HIVE_SERVICE_CHECK-SERVICE_CHECK"],
+
+ "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "INFRA_SOLR-START"],
+ "RANGER_USERSYNC-START" : ["RANGER_ADMIN-START", "RANGER_KMS_SERVER-START"],
+ "RANGER_KMS_SERVER-START" : ["RANGER_ADMIN-START"],
+ "RANGER_KMS_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_KMS_SERVER-START"],
+ "RANGER_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_USERSYNC-START", "RANGER_ADMIN-START"],
+
+ "RESOURCEMANAGER-START" : ["RANGER_USERSYNC-START"],
+ "RESOURCEMANAGER-STOP": ["HIVE_SERVER_INTERACTIVE-STOP", "SPARK_THRIFTSERVER-STOP", "SPARK2_THRIFTSERVER-STOP"],
+
+ "SLIDER_SERVICE_CHECK-SERVICE_CHECK" : ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
+
+ "SPARK_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK_JOBHISTORYSERVER-START", "LIVY_SERVER-START"],
+ "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "LIVY2_SERVER-START"],
+ "SPARK_THRIFTSERVER-START" : ["HIVE_SERVER-START"],
+
+ "SQOOP_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"],
+
+ "STORM_UI_SERVER-START" : ["NIMBUS-START", "NAMENODE-START"],
+ "STORM_REST_API-START" : ["NIMBUS-START", "STORM_UI_SERVER-START", "SUPERVISOR-START", "DRPC_SERVER-START"],
+ "SUPERVISOR-START" : ["NIMBUS-START"],
+ "STORM_SERVICE_CHECK-SERVICE_CHECK": ["NIMBUS-START", "SUPERVISOR-START", "STORM_UI_SERVER-START", "DRPC_SERVER-START"],
+
+ "TEZ_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "HISTORYSERVER-START"],
+
+ "WEBHCAT_SERVER-START": ["NODEMANAGER-START", "HIVE_SERVER-START"],
+ "WEBHCAT_SERVER-RESTART": ["NODEMANAGER-RESTART", "HIVE_SERVER-RESTART"],
+
+ "WEBHCAT_SERVICE_CHECK-SERVICE_CHECK": ["WEBHCAT_SERVER-START"],
+
+ "ZOOKEEPER_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"],
+ "ZOOKEEPER_SERVER-STOP" : ["HBASE_MASTER-STOP", "HBASE_REGIONSERVER-STOP", "METRICS_COLLECTOR-STOP"],
+ "ZOOKEEPER_QUORUM_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"]
+ },
+ "_comment" : "Dependencies that are used in HA NameNode cluster",
+ "namenode_optional_ha": {
+ "NAMENODE-START": ["ZKFC-START", "JOURNALNODE-START", "ZOOKEEPER_SERVER-START"],
+ "ZKFC-START": ["ZOOKEEPER_SERVER-START"],
+ "ZKFC-STOP": ["NAMENODE-STOP"],
+ "JOURNALNODE-STOP": ["NAMENODE-STOP"]
+ },
+ "_comment" : "Dependencies that are used in ResourceManager HA cluster",
+ "resourcemanager_optional_ha" : {
+ "RESOURCEMANAGER-START": ["ZOOKEEPER_SERVER-START", "HIVE_SERVER_INTERACTIVE-STOP", "SPARK_THRIFTSERVER-STOP", "SPARK2_THRIFTSERVER-STOP"]
+ },
+ "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster",
+ "optional_no_glusterfs": {
+ "APP_TIMELINE_SERVER-START": ["NAMENODE-START", "DATANODE-START"],
+ "DATANODE-START" : ["RANGER_USERSYNC-START"],
+ "NAMENODE-START" : ["RANGER_USERSYNC-START"],
+ "FALCON_SERVER-START": ["NAMENODE-START", "DATANODE-START"],
+ "FALCON_SERVICE_CHECK-SERVICE_CHECK": ["FALCON_SERVER-START"],
+ "SPARK_JOBHISTORYSERVER-START" : ["NAMENODE-START"],
+ "SPARK2_JOBHISTORYSERVER-START" : ["NAMENODE-START", "DATANODE-START"],
+ "SPARK2_THRIFTSERVER-START" : ["NAMENODE-START", "DATANODE-START", "HIVE_SERVER-START"]
+ },
+ "_comment" : "GLUSTERFS-specific dependencies",
+ "optional_glusterfs": {
+ "HBASE_MASTER-START": ["PEERSTATUS-START"],
+ "GLUSTERFS_SERVICE_CHECK-SERVICE_CHECK": ["PEERSTATUS-START"]
+ }
+}