AMBARI-14504. Role command order is parsed incorrectly causing Hive Service Check fail on 'Start all' (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48604428 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48604428 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48604428 Branch: refs/heads/branch-dev-patch-upgrade Commit: 48604428b05e8baa1c71e3a013f510aa5bb3a61e Parents: 73a850e Author: Andrew Onishuk <[email protected]> Authored: Mon Dec 28 15:58:26 2015 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Mon Dec 28 15:58:26 2015 +0200 ---------------------------------------------------------------------- ambari-server/pom.xml | 11 -- .../ambari/server/stack/StackDirectory.java | 6 +- .../src/main/resources/role_command_order.json | 104 ------------------- 3 files changed, 2 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/48604428/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 17d3aae..9c0ba26 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -531,9 +531,6 @@ <source> <location>${project.build.directory}/DBConnectionVerification.jar</location> </source> - <source> - <location>src/main/resources/role_command_order.json</location> - </source> </sources> </mapping> <mapping> @@ -1006,14 +1003,6 @@ </mapper> </data> <data> - <src>src/main/resources/role_command_order.json</src> - <type>file</type> - <mapper> - <type>perm</type> - <prefix>/var/lib/ambari-server/resources</prefix> - </mapper> - </data> - <data> <src>src/main/resources/scripts</src> <type>directory</type> <mapper> http://git-wip-us.apache.org/repos/asf/ambari/blob/48604428/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java index 9cfeffe..c552e41 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java @@ -487,10 +487,8 @@ public class StackDirectory extends StackDefinitionDirectory { result = mapper.readValue(file, rcoElementTypeReference); LOG.info("Role command order info was loaded from file: {}", file.getAbsolutePath()); } else { - InputStream rcoInputStream = ClassLoader.getSystemResourceAsStream(ROLE_COMMAND_ORDER_FILE); - result = mapper.readValue(rcoInputStream, rcoElementTypeReference); - LOG.info("Role command order info was loaded from classpath: " + - ClassLoader.getSystemResource(ROLE_COMMAND_ORDER_FILE)); + LOG.info("Stack '{}' doesn't contain role command order file", getPath()); + result = new HashMap<String, Object>(); } roleCommandOrder = new StackRoleCommandOrder(result); parseRoleCommandOrdersForServices(); http://git-wip-us.apache.org/repos/asf/ambari/blob/48604428/ambari-server/src/main/resources/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/role_command_order.json b/ambari-server/src/main/resources/role_command_order.json deleted file mode 100644 index 870a537..0000000 --- a/ambari-server/src/main/resources/role_command_order.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "_comment" : "Record format:", - "_comment" : "blockedRole-blockedCommand: [blockerRole1-blockerCommand1, blockerRole2-blockerCommand2, ...]", - "general_deps" : { - "_comment" : "dependencies for all cases", - "HBASE_MASTER-START": ["ZOOKEEPER_SERVER-START"], - "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"], - "OOZIE_SERVER-START": ["JOBTRACKER-START", "TASKTRACKER-START"], - "WEBHCAT_SERVER-START": ["TASKTRACKER-START", "HIVE_SERVER-START"], - "WEBHCAT_SERVER-RESTART": ["TASKTRACKER-RESTART", "HIVE_SERVER-RESTART"], - "HIVE_METASTORE-START": ["MYSQL_SERVER-START"], - "HIVE_METASTORE-RESTART": ["MYSQL_SERVER-RESTART"], - "HIVE_SERVER-START": ["TASKTRACKER-START", "MYSQL_SERVER-START"], - "HIVE_SERVER-RESTART": ["TASKTRACKER-RESTART", "MYSQL_SERVER-RESTART"], - "HUE_SERVER-START": ["HIVE_SERVER-START", "HCAT-START", "OOZIE_SERVER-START"], - "FLUME_HANDLER-START": ["OOZIE_SERVER-START"], - "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"], - "MAPREDUCE_SERVICE_CHECK-SERVICE_CHECK": ["JOBTRACKER-START", "TASKTRACKER-START"], - "OOZIE_SERVICE_CHECK-SERVICE_CHECK": ["OOZIE_SERVER-START"], - "WEBHCAT_SERVICE_CHECK-SERVICE_CHECK": ["WEBHCAT_SERVER-START"], - "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"], - "HIVE_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START", "HIVE_METASTORE-START"], - "HCAT_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START"], - "PIG_SERVICE_CHECK-SERVICE_CHECK": ["JOBTRACKER-START", "TASKTRACKER-START"], - "SQOOP_SERVICE_CHECK-SERVICE_CHECK": ["JOBTRACKER-START", "TASKTRACKER-START"], - "ACCUMULO_SERVICE_CHECK-SERVICE_CHECK": ["ACCUMULO_MASTER-START", "ACCUMULO_TSERVER-START", "ACCUMULO_TRACER-START"], - "ZOOKEEPER_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"], - "ZOOKEEPER_QUORUM_SERVICE_CHECK-SERVICE_CHECK": ["ZOOKEEPER_SERVER-START"], - "ZOOKEEPER_SERVER-STOP" : ["HBASE_MASTER-STOP", "HBASE_REGIONSERVER-STOP", "ACCUMULO_MASTER-STOP", "ACCUMULO_TSERVER-STOP", "ACCUMULO_GC-STOP"], - "ACCUMULO_MONITOR-STOP" : ["ACCUMULO_MASTER-STOP"], - "ACCUMULO_MASTER-STOP" : ["ACCUMULO_TSERVER-STOP"], - "ACCUMULO_TSERVER-STOP" : ["ACCUMULO_TRACER-STOP", "ACCUMULO_GC-STOP"], - "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"], - "TASKTRACKER-UPGRADE": ["JOBTRACKER-UPGRADE"], - "MAPREDUCE_CLIENT-UPGRADE": ["TASKTRACKER-UPGRADE", "JOBTRACKER-UPGRADE"], - "ZOOKEEPER_SERVER-UPGRADE": ["MAPREDUCE_CLIENT-UPGRADE"], - "ZOOKEEPER_CLIENT-UPGRADE": ["ZOOKEEPER_SERVER-UPGRADE"], - "HBASE_MASTER-UPGRADE": ["ZOOKEEPER_CLIENT-UPGRADE"], - "HBASE_REGIONSERVER-UPGRADE": ["HBASE_MASTER-UPGRADE"], - "HBASE_CLIENT-UPGRADE": ["HBASE_REGIONSERVER-UPGRADE"], - "HIVE_SERVER-UPGRADE" : ["HBASE_CLIENT-UPGRADE"], - "HIVE_METASTORE-UPGRADE" : ["HIVE_SERVER-UPGRADE"], - "MYSQL_SERVER-UPGRADE": ["HIVE_METASTORE-UPGRADE"], - "HIVE_CLIENT-UPGRADE": ["MYSQL_SERVER-UPGRADE"], - "HCAT-UPGRADE": ["HIVE_CLIENT-UPGRADE"], - "OOZIE_SERVER-UPGRADE" : ["HCAT-UPGRADE"], - "OOZIE_CLIENT-UPGRADE" : ["OOZIE_SERVER-UPGRADE"], - "WEBHCAT_SERVER-UPGRADE" : ["OOZIE_CLIENT-UPGRADE"], - "PIG-UPGRADE" : ["WEBHCAT_SERVER-UPGRADE"], - "SQOOP-UPGRADE" : ["PIG-UPGRADE"], - "GANGLIA_SERVER-UPGRADE" : ["SQOOP-UPGRADE"], - "GANGLIA_MONITOR-UPGRADE" : ["GANGLIA_SERVER-UPGRADE"] - }, - "_comment" : "GLUSTERFS-specific dependencies", - "optional_glusterfs": { - "HBASE_MASTER-START": ["PEERSTATUS-START"], - "JOBTRACKER-START": ["PEERSTATUS-START"], - "TASKTRACKER-START": ["PEERSTATUS-START"], - "GLUSTERFS_SERVICE_CHECK-SERVICE_CHECK": ["PEERSTATUS-START"], - "JOBTRACKER-UPGRADE": ["GLUSTERFS_CLIENT-UPGRADE"] - }, - "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster", - "optional_no_glusterfs": { - "SECONDARY_NAMENODE-START": ["NAMENODE-START"], - "RESOURCEMANAGER-START": ["NAMENODE-START", "DATANODE-START"], - "NODEMANAGER-START": ["NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START"], - "HISTORYSERVER-START": ["NAMENODE-START", "DATANODE-START"], - "HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START"], - "JOBTRACKER-START": ["NAMENODE-START", "DATANODE-START"], - "TASKTRACKER-START": ["NAMENODE-START", "DATANODE-START"], - "HIVE_SERVER-START": ["DATANODE-START"], - "WEBHCAT_SERVER-START": ["DATANODE-START"], - "HDFS_SERVICE_CHECK-SERVICE_CHECK": ["NAMENODE-START", "DATANODE-START", - "SECONDARY_NAMENODE-START"], - "MAPREDUCE2_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", - "RESOURCEMANAGER-START", "HISTORYSERVER-START", "YARN_SERVICE_CHECK-SERVICE_CHECK"], - "YARN_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START", "RESOURCEMANAGER-START"], - "RESOURCEMANAGER_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START"], - "PIG_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START", "NODEMANAGER-START"], - "NAMENODE-STOP": ["JOBTRACKER-STOP", "TASKTRACKER-STOP", "RESOURCEMANAGER-STOP", - "NODEMANAGER-STOP", "HISTORYSERVER-STOP", "HBASE_MASTER-STOP"], - "DATANODE-STOP": ["JOBTRACKER-STOP", "TASKTRACKER-STOP", "RESOURCEMANAGER-STOP", - "NODEMANAGER-STOP", "HISTORYSERVER-STOP", "HBASE_MASTER-STOP"], - "SECONDARY_NAMENODE-UPGRADE": ["NAMENODE-UPGRADE"], - "DATANODE-UPGRADE": ["SECONDARY_NAMENODE-UPGRADE"], - "HDFS_CLIENT-UPGRADE": ["DATANODE-UPGRADE"], - "JOBTRACKER-UPGRADE": ["HDFS_CLIENT-UPGRADE"] - }, - "_comment" : "Dependencies that are used in HA NameNode cluster", - "namenode_optional_ha": { - "NAMENODE-START": ["JOURNALNODE-START", "ZOOKEEPER_SERVER-START"], - "ZKFC-START": ["NAMENODE-START"], - "HDFS_SERVICE_CHECK-SERVICE_CHECK": ["ZKFC-START"] - }, - "_comment" : "Dependencies that are used in ResourceManager HA cluster", - "resourcemanager_optional_ha" : { - "RESOURCEMANAGER-START": ["ZOOKEEPER_SERVER-START"] - } -} -
