AMBARI-13616. HiveServer2 Start failed during install (Sebastian Toader via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ff2c269f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ff2c269f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ff2c269f Branch: refs/heads/branch-2.1 Commit: ff2c269f3731b3ffa8a7d083ca55a2941c62e6ff Parents: 1d51444 Author: Andrew Onishuk <[email protected]> Authored: Thu Oct 29 11:27:35 2015 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Thu Oct 29 11:27:35 2015 +0200 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.2/role_command_order.json | 6 +++--- .../apache/ambari/server/stack/StackManagerTest.java | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ff2c269f/ambari-server/src/main/resources/stacks/HDP/2.2/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.2/role_command_order.json index 3beed16..594518e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/role_command_order.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/role_command_order.json @@ -29,8 +29,8 @@ "NAMENODE-START" : ["RANGER_USERSYNC-START"], "KNOX_GATEWAY-START": ["RANGER_USERSYNC-START"], "RESOURCEMANAGER-START" : ["RANGER_USERSYNC-START"], - "NIMBUS-START": ["RANGER_USERSYNC-START"], - "HBASE_MASTER-START": ["RANGER_USERSYNC-START"], - "HIVE_SERVER-START" : ["RANGER_USERSYNC-START"] + "NIMBUS-START": ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"], + "HBASE_MASTER-START": ["ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"], + "HIVE_SERVER-START": ["NODEMANAGER-START", "MYSQL_SERVER-START", "RANGER_USERSYNC-START"] } } http://git-wip-us.apache.org/repos/asf/ambari/blob/ff2c269f/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java index a52c213..407837c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java @@ -681,6 +681,9 @@ public class StackManagerTest { String rangerUserSyncRoleCommand = Role.RANGER_USERSYNC + "-" + RoleCommand.START; String rangerAdminRoleCommand = Role.RANGER_ADMIN + "-" + RoleCommand.START; + String zookeeperServerRoleCommand = Role.ZOOKEEPER_SERVER + "-" + RoleCommand.START; + String nodeManagerRoleCommand = Role.NODEMANAGER + "-" + RoleCommand.START; + String mySqlServerRoleCommand = Role.MYSQL_SERVER + "-" + RoleCommand.START; // When StackInfo hdp = stackManager.getStack("HDP", "2.3"); @@ -690,6 +693,10 @@ public class StackManagerTest { // verify that services that have ranger plugin are after ranger admin in the role command order sequence // as these services require ranger admin and ranger user sync to up upfront Map<String, Object> generalDeps = (Map<String, Object>)rco.get("general_deps"); + Map<String, Object> optionalGlusterfs = (Map<String, Object>)rco.get("optional_glusterfs"); + Map<String, Object> optionalNoGlusterfs = (Map<String, Object>)rco.get("optional_no_glusterfs"); + Map<String, Object> namenodeOptionalHa = (Map<String, Object>)rco.get("namenode_optional_ha"); + Map<String, Object> resourcemanagerOptionalHa = (Map<String, Object>)rco.get("resourcemanager_optional_ha"); // HDFS String nameNodeRoleCommand = Role.NAMENODE + "-" + RoleCommand.START; @@ -714,6 +721,7 @@ public class StackManagerTest { ArrayList<String> hbaseBlockers = (ArrayList<String>)generalDeps.get(hbaseRoleCommand); assertTrue(hbaseRoleCommand + " should be dependent of " + rangerUserSyncRoleCommand, hbaseBlockers.contains(rangerUserSyncRoleCommand)); + assertTrue(hbaseRoleCommand + " should be dependent of " + zookeeperServerRoleCommand, hbaseBlockers.contains(zookeeperServerRoleCommand)); // Knox String knoxRoleCommand = Role.KNOX_GATEWAY + "-" + RoleCommand.START; @@ -732,12 +740,15 @@ public class StackManagerTest { ArrayList<String> hiveBlockers = (ArrayList<String>)generalDeps.get(hiveRoleCommand); assertTrue(hiveRoleCommand + " should be dependent of " + rangerUserSyncRoleCommand, hiveBlockers.contains(rangerUserSyncRoleCommand)); + assertTrue(hiveRoleCommand + " should be dependent of " + nodeManagerRoleCommand, hiveBlockers.contains(nodeManagerRoleCommand)); + assertTrue(hiveRoleCommand + " should be dependent of " + mySqlServerRoleCommand, hiveBlockers.contains(mySqlServerRoleCommand)); // Storm String stormRoleCommand = Role.NIMBUS + "-" + RoleCommand.START; ArrayList<String> stormBlockers = (ArrayList<String>)generalDeps.get(stormRoleCommand); assertTrue(stormRoleCommand + " should be dependent of " + rangerUserSyncRoleCommand, stormBlockers.contains(rangerUserSyncRoleCommand)); + assertTrue(stormRoleCommand + " should be dependent of " + zookeeperServerRoleCommand, stormBlockers.contains(zookeeperServerRoleCommand)); // Ranger KMS String kmsRoleCommand = Role.RANGER_KMS_SERVER + "-" + RoleCommand.START; @@ -752,12 +763,10 @@ public class StackManagerTest { assertTrue(rangerUserSyncRoleCommand + " should be dependent of " + kmsRoleCommand, rangerUserSyncBlockers.contains(kmsRoleCommand)); // Zookeeper Server - String zookeeperServerRoleCommand = Role.ZOOKEEPER_SERVER + "-" + RoleCommand.START; ArrayList<String> zookeeperBlockers = (ArrayList<String>)generalDeps.get(zookeeperServerRoleCommand); assertTrue(zookeeperServerRoleCommand + " should be dependent of " + rangerUserSyncRoleCommand, zookeeperBlockers.contains(rangerUserSyncRoleCommand)); - }
