Repository: ambari Updated Branches: refs/heads/branch-2.4 1d5d9b1d5 -> 57bd54231
Revert "AMBARI-18666: Move HAWQ and PXF RCO from stacks to common-services (mithmatt)" This reverts commit 5eefb316ef9e66fdd2b0360eb013f92cbb5fb3e4. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/57bd5423 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/57bd5423 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/57bd5423 Branch: refs/heads/branch-2.4 Commit: 57bd5423191a2d306342c509becf121d3d5044b5 Parents: 1d5d9b1 Author: Jonathan Hurley <[email protected]> Authored: Fri Oct 28 08:23:44 2016 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Fri Oct 28 08:23:44 2016 -0400 ---------------------------------------------------------------------- .../common-services/HAWQ/2.0.0/role_command_order.json | 11 ----------- .../common-services/PXF/3.0.0/role_command_order.json | 7 ------- .../resources/stacks/HDP/2.3/role_command_order.json | 8 ++++++++ 3 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/57bd5423/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/role_command_order.json b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/role_command_order.json deleted file mode 100644 index 6b6f7c2..0000000 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/role_command_order.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "general_deps" : { - "_comment" : "dependencies for HAWQ", - "HAWQMASTER-START" : ["NAMENODE-START", "DATANODE-START", "NODEMANAGER-START"], - "HAWQSTANDBY-START" : ["HAWQMASTER-START"], - "HAWQSTANDBY-RESTART" : ["HAWQMASTER-RESTART"], - "HAWQSEGMENT-START" : ["HAWQMASTER-START", "HAWQSTANDBY-START"], - "HAWQSEGMENT-RESTART" : ["HAWQMASTER-RESTART", "HAWQSTANDBY-RESTART"], - "HAWQ_SERVICE_CHECK-SERVICE_CHECK" : ["HAWQSEGMENT-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK", "YARN_SERVICE_CHECK-SERVICE_CHECK", "PXF_SERVICE_CHECK-SERVICE_CHECK"] - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/57bd5423/ambari-server/src/main/resources/common-services/PXF/3.0.0/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/role_command_order.json b/ambari-server/src/main/resources/common-services/PXF/3.0.0/role_command_order.json deleted file mode 100644 index a14aa49..0000000 --- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/role_command_order.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "general_deps" : { - "_comment" : "dependencies for PXF", - "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"] - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/57bd5423/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json index 2c841ca..edd6d64 100755 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/role_command_order.json @@ -12,6 +12,14 @@ "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "INFRA_SOLR-START", "HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], "SPARK_THRIFTSERVER-START" : ["NAMENODE-START", "HIVE_METASTORE-START"], "RESOURCEMANAGER-STOP" : ["SPARK_THRIFTSERVER-STOP"], + "HAWQMASTER-START" : ["NAMENODE-START", "DATANODE-START", "NODEMANAGER-START"], + "HAWQSTANDBY-START" : ["HAWQMASTER-START"], + "HAWQSTANDBY-RESTART" : ["HAWQMASTER-RESTART"], + "HAWQSEGMENT-START" : ["HAWQMASTER-START", "HAWQSTANDBY-START"], + "HAWQSEGMENT-RESTART" : ["HAWQMASTER-RESTART", "HAWQSTANDBY-RESTART"], + "HAWQ_SERVICE_CHECK-SERVICE_CHECK" : ["HAWQSEGMENT-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK", "YARN_SERVICE_CHECK-SERVICE_CHECK", "PXF_SERVICE_CHECK-SERVICE_CHECK"], + "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"], "KNOX_GATEWAY-START" : ["RANGER_USERSYNC-START", "NAMENODE-START"], "KAFKA_BROKER-START" : ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "NAMENODE-START"], "NIMBUS-START" : ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "NAMENODE-START"],
