Repository: ambari Updated Branches: refs/heads/branch-1.7.0 73bea12a4 -> 7ff9b8ebe refs/heads/trunk 2b48d33ed -> fe395d7f2
AMBARI-7877. Hive Tez configs are broken in Ambari (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7ff9b8eb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7ff9b8eb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7ff9b8eb Branch: refs/heads/branch-1.7.0 Commit: 7ff9b8ebeba4ae6f156cf43200eb5156e2d69922 Parents: 73bea12 Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Oct 23 17:41:39 2014 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Oct 23 17:41:39 2014 +0300 ---------------------------------------------------------------------- .../stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml | 2 +- .../main/resources/stacks/HDP/2.1/services/stack_advisor.py | 2 +- .../src/test/python/stacks/2.1/common/test_stack_advisor.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff9b8eb/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml index e15ca56..caed0d1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml @@ -371,7 +371,7 @@ limitations under the License. <property> <name>hive.tez.java.opts</name> - <value>-server -Xmx1024m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC</value> + <value>-server -Xmx545m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps</value> <description>Java command line options for Tez. Must be assigned the same value as mapreduce.map.child.java.opts.</description> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff9b8eb/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py index da16fce..211d803 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py @@ -43,7 +43,7 @@ class HDP21StackAdvisor(HDP206StackAdvisor): putHiveProperty = self.putProperty(configurations, "hive-site") putHiveProperty('hive.auto.convert.join.noconditionaltask.size', int(round(containerSize / 3)) * 1048576) putHiveProperty('hive.tez.java.opts', "-server -Xmx" + str(int(round(0.8 * containerSize))) - + "m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC") + + "m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps") putHiveProperty('hive.tez.container.size', containerSize) def recommendTezConfigurations(self, configurations, clusterData): http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff9b8eb/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py index 2870b8f..65a604b 100644 --- a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py @@ -80,7 +80,7 @@ class TestHDP21StackAdvisor(TestCase): "hive-site": { "properties": { "hive.auto.convert.join.noconditionaltask.size": "718274560", - "hive.tez.java.opts": "-server -Xmx1645m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC", + "hive.tez.java.opts": "-server -Xmx1645m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps", "hive.tez.container.size": "2056" } } @@ -101,7 +101,7 @@ class TestHDP21StackAdvisor(TestCase): "hive-site": { "properties": { "hive.auto.convert.join.noconditionaltask.size": "1048576000", - "hive.tez.java.opts": "-server -Xmx2400m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC", + "hive.tez.java.opts": "-server -Xmx2400m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps", "hive.tez.container.size": "3000" } } @@ -151,7 +151,7 @@ class TestHDP21StackAdvisor(TestCase): "hive-site": { "properties": { "hive.auto.convert.join.noconditionaltask.size": "268435456", - "hive.tez.java.opts": "-server -Xmx614m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC", + "hive.tez.java.opts": "-server -Xmx614m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps", "hive.tez.container.size": "768" } }
