AMBARI-2059. Add dependency for Nagios server on Hive Client install. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1477801 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -818,6 +818,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2059. Add dependency for Nagios server on Hive Client install. (swagle)
+
  AMBARI-2044. hive-site.xml permission denied exception. (swagle)
 
  AMBARI-2057. Gmond left in init after install. (smohanty)

ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java

@@ -84,6 +84,17 @@ public class RoleCommandOrder {
   }
 
   public static void initialize() {
+    // Installs
+    addDependency(Role.NAGIOS_SERVER, RoleCommand.INSTALL, Role.HIVE_CLIENT,
+      RoleCommand.INSTALL);
+    addDependency(Role.NAGIOS_SERVER, RoleCommand.INSTALL, Role.HCAT,
+      RoleCommand.INSTALL);
+    addDependency(Role.NAGIOS_SERVER, RoleCommand.INSTALL, Role.MAPREDUCE_CLIENT,
+      RoleCommand.INSTALL);
+    addDependency(Role.NAGIOS_SERVER, RoleCommand.INSTALL, Role.OOZIE_CLIENT,
+      RoleCommand.INSTALL);
+
+    // Starts
     addDependency(Role.SECONDARY_NAMENODE, RoleCommand.START, Role.NAMENODE,
         RoleCommand.START);
     addDependency(Role.RESOURCEMANAGER, RoleCommand.START, Role.NAMENODE,

ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java

@@ -47,7 +47,21 @@ public class RoleGraphTest {
     RoleGraphNode jobtracker_start = new RoleGraphNode(Role.JOBTRACKER, RoleCommand.START);
     Assert.assertEquals(1, rco.order(datanode_start, datanode_install));
     Assert.assertEquals(1, rco.order(jobtracker_start, datanode_start));
-
     Assert.assertEquals(0, rco.order(jobtracker_start, jobtracker_start));
+
+    RoleGraphNode hive_client_install = new RoleGraphNode(Role.HIVE_CLIENT,
+      RoleCommand.INSTALL);
+    RoleGraphNode mapred_client_install = new RoleGraphNode(Role.MAPREDUCE_CLIENT,
+      RoleCommand.INSTALL);
+    RoleGraphNode hcat_client_install = new RoleGraphNode(Role.HCAT,
+      RoleCommand.INSTALL);
+    RoleGraphNode nagios_server_install = new RoleGraphNode(Role.NAGIOS_SERVER,
+      RoleCommand.INSTALL);
+    RoleGraphNode oozie_client_install = new RoleGraphNode(Role.OOZIE_CLIENT,
+      RoleCommand.INSTALL);
+    Assert.assertEquals(1, rco.order(nagios_server_install, hive_client_install));
+    Assert.assertEquals(1, rco.order(nagios_server_install, mapred_client_install));
+    Assert.assertEquals(1, rco.order(nagios_server_install, hcat_client_install));
+    Assert.assertEquals(1, rco.order(nagios_server_install, oozie_client_install));
   }
 }