You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/05/05 22:03:03 UTC

ambari git commit: AMBARI-10932. Hive Configs: make 'hive.auto.convert.join.noconditionaltask.size' dependent on Tez container size. (mpapirkovskyy via srimanth)

Repository: ambari
Updated Branches:
  refs/heads/trunk 9735a78d6 -> 03bbb08b5


AMBARI-10932. Hive Configs: make 'hive.auto.convert.join.noconditionaltask.size' dependent on Tez container size. (mpapirkovskyy via srimanth)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03bbb08b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03bbb08b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03bbb08b

Branch: refs/heads/trunk
Commit: 03bbb08b5d5b493bf8f2d013ebae340fc35179c9
Parents: 9735a78
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Tue May 5 13:02:00 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue May 5 13:02:49 2015 -0700

----------------------------------------------------------------------
 .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py | 5 ++++-
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/03bbb08b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 6eea9b7..fd3da2e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -306,8 +306,11 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
     putHiveSiteProperty("hive.tez.auto.reducer.parallelism", "true")
     putHiveSiteProperty("hive.tez.dynamic.partition.pruning", "true")
 
+    container_size = configurations["hive-site"]["properties"]["hive.tez.container.size"]
+    container_size_bytes = int(container_size)*1024*1024
     # Memory
-    putHiveSiteProperty("hive.auto.convert.join.noconditionaltask.size", int(int(container_size)*1024*1024/3))
+    putHiveSiteProperty("hive.auto.convert.join.noconditionaltask.size", int(container_size_bytes/3))
+    putHiveSitePropertyAttribute("hive.auto.convert.join.noconditionaltask.size", "maximum", container_size_bytes)
     putHiveSiteProperty("hive.exec.reducers.bytes.per.reducer", "67108864")
 
     # CBO

http://git-wip-us.apache.org/repos/asf/ambari/blob/03bbb08b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index bd13a11..fa55a4f 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -909,6 +909,7 @@ class TestHDP22StackAdvisor(TestCase):
           'hive.vectorized.execution.reduce.enabled': 'false'
         },
        'property_attributes': {
+         'hive.auto.convert.join.noconditionaltask.size': {'maximum': '268435456'},
          'hive.server2.authentication.pam.services': {'delete': 'true'}, 
          'hive.server2.custom.authentication.class': {'delete': 'true'}, 
          'hive.server2.authentication.ldap.baseDN': {'delete': 'true'},