You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/10/20 18:16:49 UTC
ambari git commit: Revert "AMBARI-18645. Move ATLAS role command
order to common-services/ATLAS (aonishuk)"
Repository: ambari
Updated Branches:
refs/heads/trunk 1d5178ce7 -> 563b41def
Revert "AMBARI-18645. Move ATLAS role command order to common-services/ATLAS (aonishuk)"
This reverts commit 311124d2535897ae672a65e221f26d131ceaf3b4.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/563b41de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/563b41de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/563b41de
Branch: refs/heads/trunk
Commit: 563b41def0995301f190a1c82c8190c3d7646d92
Parents: 1d5178c
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Oct 20 21:16:36 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Oct 20 21:16:36 2016 +0300
----------------------------------------------------------------------
.../common-services/ATLAS/0.1.0.2.3/role_command_order.json | 7 -------
.../common-services/ATLAS/0.7.0.2.5/role_command_order.json | 7 -------
.../src/main/resources/stacks/HDP/2.3/role_command_order.json | 2 ++
.../src/main/resources/stacks/HDP/2.5/role_command_order.json | 1 +
4 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/563b41de/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/role_command_order.json b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/role_command_order.json
deleted file mode 100644
index 4d66dfc..0000000
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/role_command_order.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "general_deps" : {
- "_comment" : "dependencies for ATLAS",
- "ATLAS_SERVICE_CHECK-SERVICE_CHECK": ["ATLAS_SERVER-START"],
- "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "INFRA_SOLR-START", "HBASE_MASTER-START", "HBASE_REGIONSERVER-START"]
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/563b41de/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/role_command_order.json b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/role_command_order.json
deleted file mode 100644
index 372cd21..0000000
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/role_command_order.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "general_deps" : {
- "_comment" : "dependencies for ATLAS",
- "ATLAS_SERVICE_CHECK-SERVICE_CHECK": ["ATLAS_SERVER-START"],
- "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "LOGSEARCH_SOLR-START", "HBASE_MASTER-START", "HBASE_REGIONSERVER-START"]
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/563b41de/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 4f279c6..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
@@ -8,6 +8,8 @@
"RANGER_KMS_SERVER-START" : ["RANGER_ADMIN-START"],
"RANGER_KMS_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_KMS_SERVER-START"],
"PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-START"],
+ "ATLAS_SERVICE_CHECK-SERVICE_CHECK": ["ATLAS_SERVER-START"],
+ "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"],
http://git-wip-us.apache.org/repos/asf/ambari/blob/563b41de/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
index 7af9d73..f2616b0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json
@@ -13,6 +13,7 @@
"LIVY_SERVER-START" : ["NAMENODE-START", "DATANODE-START", "APP_TIMELINE_SERVER-START"],
"SPARK_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK_JOBHISTORYSERVER-START", "LIVY_SERVER-START"],
"SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"],
+ "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "LOGSEARCH_SOLR-START", "HBASE_MASTER-START", "HBASE_REGIONSERVER-START"]
},
"_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster",
"optional_no_glusterfs": {