incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: Revert "AMBARI-3242. HBase, Zookeeper and Oozie failed to start when adding services after initial cluster setup. (Vladimir Tkhir via swagle)"
Date Fri, 22 Nov 2013 08:25:51 GMT
Updated Branches:
  refs/heads/branch-1.4.2 85206b97a -> 87adc8c2d


Revert "AMBARI-3242. HBase, Zookeeper and Oozie failed to start when adding services after
initial cluster setup. (Vladimir Tkhir via swagle)"

This reverts commit 94dae66098440386c093840bae97692e76771260.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/87adc8c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/87adc8c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/87adc8c2

Branch: refs/heads/branch-1.4.2
Commit: 87adc8c2d29b20a30f01e54c12f67dcbbe34b32e
Parents: 85206b9
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Thu Nov 21 23:39:31 2013 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Fri Nov 22 00:26:14 2013 -0800

----------------------------------------------------------------------
 .../main/puppet/modules/hdp-hbase/manifests/master.pp   |  8 --------
 .../main/puppet/modules/hdp-oozie/manifests/server.pp   | 10 +---------
 .../puppet/modules/hdp-zookeeper/manifests/service.pp   | 12 ++----------
 3 files changed, 3 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/87adc8c2/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp
index 0730bcb..c16b1af 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/master.pp
@@ -44,14 +44,6 @@ class hdp-hbase::master(
       type          => 'master',
       service_state => $service_state
     }
-    
-    hdp-hadoop::namenode::create_app_directories { 'create_app_directories' :
-      service_state => $service_state
-    }
-
-    hdp-hadoop::namenode::create_user_directories { 'create_user_directories' :
-      service_state => $service_state
-    }
 
     Hdp-hbase::Configfile<||>{hbase_master_hosts => $hdp::params::host_address}
   

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/87adc8c2/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
index 3f39c8d..5930296 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/server.pp
@@ -51,14 +51,6 @@ class hdp-oozie::server(
       }
     }
 
-    hdp-hadoop::namenode::create_app_directories { 'create_app_directories' :
-      service_state => $service_state
-    }
-
-    hdp-hadoop::namenode::create_user_directories { 'create_user_directories' :
-      service_state => $service_state
-    }
-
     #installs package, creates user, sets configuration
     class{ 'hdp-oozie' : 
       service_state => $service_state,
@@ -73,7 +65,7 @@ class hdp-oozie::server(
     }
   
     #top level does not need anchors
-    Hdp-Hadoop::Namenode::Create_app_directories['create_app_directories'] -> Hdp-Hadoop::Namenode::Create_user_directories['create_user_directories']
-> Class['hdp-oozie'] -> Class['hdp-oozie::service']
+    Class['hdp-oozie'] -> Class['hdp-oozie::service']
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")
   }

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/87adc8c2/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
index 2a7799c..0456520 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/service.pp
@@ -69,21 +69,13 @@ class hdp-zookeeper::service(
     }
   }
 
-  hdp-hadoop::namenode::create_app_directories { 'create_app_directories' :
-    service_state => $service_state
-  }
-
-  hdp-hadoop::namenode::create_user_directories { 'create_user_directories' :
-    service_state => $service_state
-  }
-
   if ($ensure == 'uninstalled') {
     anchor{'hdp-zookeeper::service::begin':} -> Hdp::Directory_recursive_create<|context_tag
== 'zk_service'|> ->  anchor{'hdp-zookeeper::service::end':}
   } else {
     class { 'hdp-zookeeper::set_myid': myid => $myid}
 
-    anchor{'hdp-zookeeper::service::begin':} -> Hdp-hadoop::Namenode::Create_user_directories['create_user_directories']
-> Hdp-hadoop::Namenode::Create_app_directories['create_app_directories'] -> 
-    Hdp::Directory_recursive_create<|context_tag == 'zk_service'|> -> Class['hdp-zookeeper::set_myid']
-> anchor{'hdp-zookeeper::service::end':}
+    anchor{'hdp-zookeeper::service::begin':} -> Hdp::Directory_recursive_create<|context_tag
== 'zk_service'|> -> 
+    Class['hdp-zookeeper::set_myid'] -> anchor{'hdp-zookeeper::service::end':}
 
     if ($daemon_cmd != undef) {
       Class['hdp-zookeeper::set_myid'] -> Hdp::Exec[$daemon_cmd] -> Anchor['hdp-zookeeper::service::end']


Mime
View raw message