modules/hadoop2/hadoop2.rb in nuri-0.5.3 vs modules/hadoop2/hadoop2.rb in nuri-0.5.4

@@ -1,24 +1,22 @@
-require ::File.dirname(__FILE__) + '/../tarpackage/tarpackage.rb'
+require ::File.dirname(__FILE__) + '/../package2/package2.rb'
 
 module Sfp::Module::Hadoop2Common
 	def update_state
-		to_model
-
 		super
 
 		@state['running'] = running?
 		@state['configured'] = configured?
 		@state['pids'] = pids
 		@state['java_home'] = java_home
 
-		start if @state['running']
+		#start if @state['running']
 	end
 
 	##############################
 	#
-	# Action methods (see Hadoop.sfp)
+	# Action methods (see hadoop2.sfp)
 	#
 	##############################
 
 	def uninstall(p={})
 		model = OpenStruct.new(@model)
@@ -155,20 +153,22 @@
 			'yarn_nodemanager_vmem_pmem_ratio' => 2,
 			'yarn_nodemanager_log_retain_seconds' => 10800,
 			'yarn_nodemanager_aux_services' => 'mapreduce_shuffle',
 			'yarn_log_aggregation_retain_seconds' => -1,
 			'yarn_log_aggregation_retain_check_interval_seconds' => -1,
+			'yarn_nodemanager_hostname' => local_address,
 			'yarn_nodemanager_local_dirs' => @model['data_dir'] + "/yarn_local_dir",
 			'yarn_nodemanager_log_dirs' => @model['data_dir'] + "/yarn_log_dir",
 			'yarn_web_proxy_address' => local_address,
 			'io_file_buffer_size' => 131072,
 		}
 	end
 
 	def local_address
-		domain = `dnsdomainname`.to_s.strip
-		`hostname`.to_s.strip + (domain.length > 0 ? '.' + domain : '')
+		resolve("$.#{Sfp::Agent.whoami?}.sfpAddress")
+		#domain = `dnsdomainname`.to_s.strip
+		#`hostname`.to_s.strip + (domain.length > 0 ? '.' + domain : '')
 	end
 
 	# TODO -- user "useradd" and "groupadd"
 	def add_user_group
 		user = @model['user']
@@ -214,18 +214,18 @@
 		### set ownership
 		shell "chown -R #{@model['user']}:#{@model['group']} #{data_dir}"
 	end
 end
 
-class Sfp::Module::Hadoop2Master < Sfp::Module::TarPackage
+class Sfp::Module::Hadoop2Master < Sfp::Module::Package2
 	include ::Sfp::Module::Hadoop2Common
 
 	Services = ['namenode', 'resourcemanager', 'historyserver', 'proxyserver']
 
 	##############################
 	#
-	# Action methods (see TarPackage.sfp)
+	# Action methods (see hadoop2.sfp)
 	#
 	##############################
 
 	def start(p={})
 		model = OpenStruct.new(@model)
@@ -328,17 +328,17 @@
 		cmd = "#{@model['home']}/bin/hdfs namenode -format #{@model['cluster_name']}"
 		log.info `su -c '#{cmd}' #{@model['user']}`
 	end
 end
 
-class Sfp::Module::Hadoop2Slave < Sfp::Module::TarPackage
+class Sfp::Module::Hadoop2Slave < Sfp::Module::Package2
 	include ::Sfp::Module::Hadoop2Common
 
 	Services = ['datanode', 'nodemanager']
 
 	##############################
 	#
-	# Action methods (see TarPackage.sfp)
+	# Action methods (see hadoop2.sfp)
 	#
 	##############################
 
 	def start(p={})
 		model = OpenStruct.new(@model)