AMBARI-2684. Circular dependency issue when run directories are sub directories of NNdata dirs. (Dmitry Lysnichenko via smohanty)

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp

@@ -81,8 +81,7 @@ class hdp-hadoop::datanode(
     }
     
     #top level does not need anchors
-    Class['hdp-hadoop'] -> Hdp-hadoop::Service['datanode']
-    Hdp-hadoop::Datanode::Create_data_dirs<||> -> Hdp-hadoop::Service['datanode']
+    Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Datanode::Create_data_dirs<||> -> Hdp-hadoop::Service['datanode'] -> Anchor['hdp-hadoop::end'] 
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp

@@ -75,8 +75,10 @@ class hdp-hadoop::jobtracker(
     }
 
     #top level does not need anchors
-    Class['hdp-hadoop'] -> Hdp-hadoop::Service['jobtracker'] -> Hdp-hadoop::Service['historyserver']
-    Hdp-hadoop::Jobtracker::Create_local_dirs<||> -> Hdp-hadoop::Service['jobtracker']
+    Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Service['jobtracker'] -> Hdp-hadoop::Service['historyserver'] 
+    -> Anchor['hdp-hadoop::end']
+    Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Jobtracker::Create_local_dirs<||> -> Hdp-hadoop::Service['jobtracker'] 
+    -> Anchor['hdp-hadoop::end']
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp

@@ -90,12 +90,12 @@ class hdp-hadoop::namenode(
     }
 
     #top level does not need anchors
-    Class['hdp-hadoop'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> -> Hdp-hadoop::Service['namenode'] ->
+    Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> -> Hdp-hadoop::Service['namenode'] ->
       # Now, creating directories inside HDFS
-      Hdp-hadoop::Namenode::Create_app_directories<||> -> Hdp-hadoop::Namenode::Create_user_directories<||>
+      Hdp-hadoop::Namenode::Create_app_directories<||> -> Hdp-hadoop::Namenode::Create_user_directories<||> -> Anchor['hdp-hadoop::end']
     if ($service_state == 'running' and $format == true) {
-      Class['hdp-hadoop'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> ->
-        Class['hdp-hadoop::namenode::format'] -> Hdp-hadoop::Service['namenode']
+      Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> ->
+        Class['hdp-hadoop::namenode::format'] -> Hdp-hadoop::Service['namenode'] -> Anchor['hdp-hadoop::end']
     }
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp

@@ -79,8 +79,8 @@ class hdp-hadoop::snamenode(
     }
   
     #top level does not need anchors
-    Class['hdp-hadoop'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> ->
-      Hdp-hadoop::Service['secondarynamenode']
+    Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Namenode::Create_name_dirs<||> ->
+      Hdp-hadoop::Service['secondarynamenode'] -> Anchor['hdp-hadoop::end']
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp

@@ -73,7 +73,8 @@ class hdp-hadoop::tasktracker(
     }
   
     #top level does not need anchors
-    Class['hdp-hadoop'] -> Hdp-hadoop::Tasktracker::Create_local_dirs<||> -> Hdp-hadoop::Service['tasktracker']
+    Anchor['hdp-hadoop::begin'] -> Hdp-hadoop::Tasktracker::Create_local_dirs<||> -> Hdp-hadoop::Service['tasktracker'] ->
+    Anchor['hdp-hadoop::end']
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }