You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/10/28 17:45:57 UTC
[18/38] ambari git commit: Revert "AMBARI-18666: Move HAWQ and PXF
RCO from stacks to common-services (mithmatt)"
Revert "AMBARI-18666: Move HAWQ and PXF RCO from stacks to common-services (mithmatt)"
This reverts commit 039562ca1f7b76222b574062da9756bae72d9a15.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b334d307
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b334d307
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b334d307
Branch: refs/heads/branch-feature-AMBARI-18634
Commit: b334d307ee8c3a41247bded9943e23ab6cb8530f
Parents: 3617fd9
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Oct 28 08:21:09 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Oct 28 08:21: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/b334d307/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/b334d307/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/b334d307/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 7626630..4f279c6 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
@@ -10,6 +10,14 @@
"PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-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"],