Updated Branches: refs/heads/branch-1.2.5 31dc564a3 -> 1fe25a751
AMBARI-2684. Circular dependency issue when run directories are sub directories of NNdata dirs. (Dmitry Lysnichenko via smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/1fe25a75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/1fe25a75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/1fe25a75 Branch: refs/heads/branch-1.2.5 Commit: 1fe25a7519783774663e5d48a197fb545a22c16f Parents: 31dc564 Author: Sumit Mohanty <[email protected]> Authored: Thu Jul 18 18:18:34 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Thu Jul 18 18:19:36 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp | 3 +-- .../main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp | 6 ++++-- .../src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp | 8 ++++---- .../main/puppet/modules/hdp-hadoop/manifests/snamenode.pp | 4 ++-- .../main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp | 3 ++- 5 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1fe25a75/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp index 0b26c61..61fd347 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/datanode.pp +++ b/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}") } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1fe25a75/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp index 3c8c158..b96ca2f 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/jobtracker.pp +++ b/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}") } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1fe25a75/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp index 9ceac58..c891958 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp +++ b/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}") http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1fe25a75/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp index f053609..bb6a720 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/snamenode.pp +++ b/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}") } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1fe25a75/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp index d5be16a..a86ae73 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp +++ b/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}") }
