hadoop2.rb in nuri-0.5.2

- old
+ new

@@ -137,34 +137,40 @@
 			'dfs_blocksize' => 268435456,
 			'dfs_namenode_handler_count' => 10,
 			'dfs_datanode_data_dir' => @model['data_dir'] + "/datanode_data",
 			'mapreduce_framework_name' => 'yarn',
 			'mapreduce_map_memory_mb' => 1536,
-			'mapreduce_map_java_opts' => '-Xmx1024M',
+			'mapreduce_map_java_opts' => '-Xmx2048M',
 			'mapreduce_reduce_memory_mb' => 3072,
 			'mapreduce_reduce_java_opts' => '-Xmx2560M',
 			'mapreduce_task_io_sort_mb' => 512,
 			'mapreduce_task_io_sort_factor' => 100,
 			'mapreduce_reduce_shuffle_parallelcopies' => 50,
 			'yarn_acl_enable' => false,
 			'yarn_admin_acl' => '*',
 			'yarn_log_aggregation_enable' => false,
 			'yarn_resourcemanager_scheduler_class' => 'org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler',
 			'yarn_scheduler_minimum_allocation_mb' => 256,
-			'yarn_scheduler_maximum_allocation_mb' => 1024,
+			'yarn_scheduler_maximum_allocation_mb' => 2048,
 			'yarn_nodemanager_resource_memory_mb' => 512,
 			'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_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 : '')
+	end
+
 	# TODO -- user "useradd" and "groupadd"
 	def add_user_group
 		user = @model['user']
 		group = @model['group']
 
@@ -306,11 +312,11 @@
 		data
 	end
 
 	def map
 		map = common_map
-		map['master'] = `hostname`.to_s.strip
+		map['master'] = local_address
 		map
 	end
 
 	def create_data_directory
 		return if ::File.exist?(@model['data_dir'])
@@ -390,9 +396,10 @@
 	end
 
 	def map
 		map = common_map
 		map['master'] = resolve(@model['master'] + '.parent.sfpAddress')
+		map['yarn_web_proxy_address'] = resolve(@model['master'] + '.parent.sfpAddress')
 		map
 	end
 
 	def create_data_directory
 		common_create_data_directory