AMBARI-5455. Ambari configuration for map join conversion and tez container size seems wrong - additional fixes. (srimanth)

Conflicts:
	ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js

ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml

@@ -352,7 +352,7 @@ limitations under the License.
 
   <property>
     <name>hive.tez.java.opts</name>
-    <value>-server -Xmx1024m -Djava.net.preferIPv4Stack=true</value>
+    <value>-server -Xmx1024m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC</value>
     <description></description>
   </property>
 
@@ -383,7 +383,7 @@ limitations under the License.
 
   <property>
     <name>hive.server2.tez.default.queues</name>
-    <value></value>
+    <value>default</value>
     <description></description>
   </property>
 

ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js

@@ -33,7 +33,7 @@ App.HiveDefaultsProvider = App.YARNDefaultsProvider.extend({
       var containerSize = configs['mapreduce.map.memory.mb'] > 2048 ? configs['mapreduce.map.memory.mb'] : configs['mapreduce.reduce.memory.mb'];
       containerSize = Math.min(configs['yarn.scheduler.maximum-allocation-mb'], containerSize);
       configs['hive.auto.convert.join.noconditionaltask.size'] = Math.round(containerSize / 3) * 1048576; // MB to Bytes
-      configs['hive.tez.java.opts'] = "-server -Xmx" + containerSize + "m -Djava.net.preferIPv4Stack=true";
+      configs['hive.tez.java.opts'] = "-server -Xmx" + Math.round(0.8 * containerSize) + "m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC";
       configs['hive.tez.container.size'] = containerSize;
     } else {
       jQuery.extend(configs, this.get('configsTemplate'));