Browse Source

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.
Yusaku Sako 11 năm trước cách đây
mục cha
commit
1bce5da14f

+ 0 - 8
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}
   

+ 1 - 9
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}")
   }

+ 2 - 10
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']