Merge pull request #1285 from ronny-macmaster/fair_share_queue

Allow fair_share_queue overrides

Author: vt0r

cookbooks/bcpc-hadoop/libraries/hadoop_helpers.rb

@@ -29,7 +29,7 @@ def write_queue_xml(queue_name, queue_definition, all_queues)
           q.parent['name'] = queue_name
           # process minResource, weight, etc. tags under the queue
           queue_definition.select do |k, v|
-            !Set.new(non_render_attributes).include?(k) && !v.nil?
+            !Set.new(non_render_attributes).include?(k.to_sym) && !v.nil?
           end.each do |k,v|
             q.send(k) do |attr|
               attr.text v.to_s

cookbooks/bcpc-hadoop/recipes/yarn_schedulers.rb

@@ -12,10 +12,20 @@
 end
 
 file "/etc/hadoop/conf/fair-scheduler.xml" do
-  content lazy {fair_scheduler_xml(node.run_state[:fair_scheduler_queue] || [],
-    node[:bcpc][:hadoop][:yarn][:fairSchedulerOpts],
-    node[:bcpc][:hadoop][:yarn][:queuePlacementPolicy])}
   mode 0644
+  content lazy {
+    # Merge the fair_scheduler_queue environment overrides
+    # into the definitions from fair_scheduler_queue resources.
+    # Definitions in the node attribute take precedence over the resources.
+    queue_defs = node.run_state[:fair_scheduler_queue] || {}
+    queue_overrides = node[:bcpc][:hadoop][:yarn][:fair_scheduler_queue] || {}
+
+    fair_scheduler_xml(
+      queue_defs.merge(queue_overrides),
+      node[:bcpc][:hadoop][:yarn][:fairSchedulerOpts],
+      node[:bcpc][:hadoop][:yarn][:queuePlacementPolicy]
+    )
+  }
 end
 
 template "/etc/hadoop/conf/capacity-scheduler.xml" do