ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [1/2] ambari git commit: AMBARI-13616. HiveServer2 Start failed during install (Sebastian Toader via aonishuk)
Date Thu, 29 Oct 2015 09:27:41 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 1d5144420 -> ff2c269f3
  refs/heads/trunk b591250fb -> 60925f39b


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/60925f39
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60925f39
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60925f39

Branch: refs/heads/trunk
Commit: 60925f39b8ab6838db8f3636645e9591b00e1f1b
Parents: b591250
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Thu Oct 29 11:27:33 2015 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Oct 29 11:27:33 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/60925f39/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/60925f39/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 6a13ab2..0a7bc74 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
@@ -692,6 +692,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");
@@ -701,6 +704,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;
@@ -725,6 +732,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;
@@ -743,12 +751,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;
@@ -763,12 +774,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));
 
-
   }
 
 


Mime
View raw message