AMBARI-2235. NN enters safe mode upon HDFS restart. (smohanty)

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

CHANGES.txt

@@ -907,6 +907,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2235. NN enters safe mode upon HDFS restart. (smohanty)
+
  AMBARI-2225. Security fixes with HBase service check. (jaimin)
 
  AMBARI-2233. Ensure version values are used appropriately throughout

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

@@ -155,6 +155,8 @@ public class RoleCommandOrder {
         RoleCommand.START);
     addDependency(Role.HDFS_SERVICE_CHECK, RoleCommand.EXECUTE, Role.DATANODE,
         RoleCommand.START);
+    addDependency(Role.HDFS_SERVICE_CHECK, RoleCommand.EXECUTE, Role.SECONDARY_NAMENODE,
+        RoleCommand.START);
     addDependency(Role.MAPREDUCE_SERVICE_CHECK, RoleCommand.EXECUTE,
         Role.JOBTRACKER, RoleCommand.START);
     addDependency(Role.MAPREDUCE_SERVICE_CHECK, RoleCommand.EXECUTE,
@@ -179,6 +181,10 @@ public class RoleCommandOrder {
         Role.JOBTRACKER, RoleCommand.START);
     addDependency(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE,
         Role.TASKTRACKER, RoleCommand.START);
+    addDependency(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE,
+        Role.RESOURCEMANAGER, RoleCommand.START);
+    addDependency(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE,
+        Role.NODEMANAGER, RoleCommand.START);
     addDependency(Role.SQOOP_SERVICE_CHECK, RoleCommand.EXECUTE,
         Role.JOBTRACKER, RoleCommand.START);
     addDependency(Role.SQOOP_SERVICE_CHECK, RoleCommand.EXECUTE,

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

@@ -63,5 +63,13 @@ public class RoleGraphTest {
     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));
+
+    RoleGraphNode pig_service_check = new RoleGraphNode(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE);
+    RoleGraphNode resourcemanager_start = new RoleGraphNode(Role.RESOURCEMANAGER, RoleCommand.START);
+    Assert.assertEquals(-1, rco.order(resourcemanager_start, pig_service_check));
+
+    RoleGraphNode hdfs_service_check = new RoleGraphNode(Role.HDFS_SERVICE_CHECK, RoleCommand.EXECUTE);
+    RoleGraphNode snamenode_start = new RoleGraphNode(Role.SECONDARY_NAMENODE, RoleCommand.START);
+    Assert.assertEquals(-1, rco.order(snamenode_start, hdfs_service_check));
   }
 }