svn commit: r1477801 - in /incubator/ambari/trunk: CHANGES.txt ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java

[swagle]

Author: swagle
Date: Tue Apr 30 19:58:06 2013
New Revision: 1477801

URL: http://svn.apache.org/r1477801
Log:
AMBARI-2059. Add dependency for Nagios server on Hive Client install. (swagle)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
    
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1477801&r1=1477800&r2=1477801&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 30 19:58:06 2013
@@ -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)

Modified: 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java?rev=1477801&r1=1477800&r2=1477801&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
 (original)
+++ 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
 Tue Apr 30 19:58:06 2013
@@ -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,

Modified: 
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java?rev=1477801&r1=1477800&r2=1477801&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
 (original)
+++ 
incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
 Tue Apr 30 19:58:06 2013
@@ -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));
   }
 }