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/06/06 18:35:38 UTC
ambari git commit: AMBARI-11738. Remove "Max idle tez session length"
from hive enhanced config tab (Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 0474ef6ec -> 27aea4ce3
AMBARI-11738. Remove "Max idle tez session length" from hive enhanced config tab (Richard Zang via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27aea4ce
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27aea4ce
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27aea4ce
Branch: refs/heads/trunk
Commit: 27aea4ce3e35b37ea1ec654bb4c3089b72cfd7c0
Parents: 0474ef6
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Sat Jun 6 09:35:08 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Sat Jun 6 09:35:15 2015 -0700
----------------------------------------------------------------------
.../services/HIVE/configuration/hiveserver2-site.xml | 14 --------------
.../stacks/HDP/2.2/services/HIVE/themes/theme.json | 15 ---------------
.../stacks/HDP/2.2/services/stack_advisor.py | 2 +-
.../services/HIVE/configuration/hiveserver2-site.xml | 14 --------------
.../HDPWIN/2.2/services/HIVE/themes/theme.json | 15 ---------------
.../stacks/HDPWIN/2.2/services/stack_advisor.py | 2 +-
.../python/stacks/2.2/common/test_stack_advisor.py | 12 +++++++-----
7 files changed, 9 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/27aea4ce/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
index 64dda93..685ff64 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hiveserver2-site.xml
@@ -33,20 +33,6 @@ limitations under the License.
</property>
<property>
- <name>tez.session.am.dag.submit.timeout.secs</name>
- <value>600</value>
- <description></description>
- <display-name>Max idle tez session length</display-name>
- <value-attributes>
- <type>int</type>
- <minimum>600</minimum>
- <maximum>86400</maximum>
- <unit>seconds</unit>
- <step-increment>600</step-increment>
- </value-attributes>
- </property>
-
- <property>
<name>hive.server2.enable.doAs</name>
<value>true</value>
<description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/27aea4ce/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
index c810f6d..1d88c73 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
@@ -208,10 +208,6 @@
"subsection-name": "interactive-query-row1-col1"
},
{
- "config": "hiveserver2-site/tez.session.am.dag.submit.timeout.secs",
- "subsection-name": "interactive-query-row1-col1"
- },
- {
"config": "hive-env/hive_security_authorization",
"subsection-name": "security-row1-col1"
},
@@ -368,17 +364,6 @@
}
},
{
- "config": "hiveserver2-site/tez.session.am.dag.submit.timeout.secs",
- "widget": {
- "type": "time-interval-spinner",
- "units": [
- {
- "unit-name": "hours,minutes"
- }
- ]
- }
- },
- {
"config": "hive-env/hive_security_authorization",
"widget": {
"type": "combo"
http://git-wip-us.apache.org/repos/asf/ambari/blob/27aea4ce/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 ebbdef2..5839149 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
@@ -349,7 +349,6 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
putHiveServerProperty("hive.server2.tez.initialize.default.sessions", "false")
putHiveServerProperty("hive.server2.tez.sessions.per.default.queue", "1")
putHiveServerProperty("hive.server2.enable.doAs", "true")
- putHiveServerProperty("tez.session.am.dag.submit.timeout.secs", "600")
yarn_queues = "default"
if "capacity-scheduler" in configurations and \
@@ -563,6 +562,7 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
putTezProperty("tez.task.resource.memory.mb", taskResourceMemory)
putTezProperty("tez.runtime.io.sort.mb", min(int(taskResourceMemory * 0.4), 2047))
putTezProperty("tez.runtime.unordered.output.buffer.size-mb", int(taskResourceMemory * 0.075))
+ putTezProperty("tez.session.am.dag.submit.timeout.secs", "600")
def getServiceConfigurationValidators(self):
parentValidators = super(HDP22StackAdvisor, self).getServiceConfigurationValidators()
http://git-wip-us.apache.org/repos/asf/ambari/blob/27aea4ce/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml
index 7858ae2..c0cb31c 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml
@@ -31,20 +31,6 @@ limitations under the License.
<description>the hive client authorization manager class name.
The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description>
</property>
-
- <property>
- <name>tez.session.am.dag.submit.timeout.secs</name>
- <value>600</value>
- <description></description>
- <display-name>Max idle tez session length</display-name>
- <value-attributes>
- <type>int</type>
- <minimum>600</minimum>
- <maximum>86400</maximum>
- <unit>seconds</unit>
- <step-increment>600</step-increment>
- </value-attributes>
- </property>
<property>
<name>hive.server2.enable.doAs</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/27aea4ce/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json
index c810f6d..1d88c73 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json
@@ -208,10 +208,6 @@
"subsection-name": "interactive-query-row1-col1"
},
{
- "config": "hiveserver2-site/tez.session.am.dag.submit.timeout.secs",
- "subsection-name": "interactive-query-row1-col1"
- },
- {
"config": "hive-env/hive_security_authorization",
"subsection-name": "security-row1-col1"
},
@@ -368,17 +364,6 @@
}
},
{
- "config": "hiveserver2-site/tez.session.am.dag.submit.timeout.secs",
- "widget": {
- "type": "time-interval-spinner",
- "units": [
- {
- "unit-name": "hours,minutes"
- }
- ]
- }
- },
- {
"config": "hive-env/hive_security_authorization",
"widget": {
"type": "combo"
http://git-wip-us.apache.org/repos/asf/ambari/blob/27aea4ce/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
index 7a57759..6d123b0 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
@@ -374,7 +374,6 @@ class HDPWIN22StackAdvisor(HDPWIN21StackAdvisor):
putHiveServerProperty("hive.server2.tez.initialize.default.sessions", "false")
putHiveServerProperty("hive.server2.tez.sessions.per.default.queue", "1")
putHiveServerProperty("hive.server2.enable.doAs", "true")
- putHiveServerProperty("tez.session.am.dag.submit.timeout.secs", "600")
yarn_queues = "default"
if "capacity-scheduler" in configurations and \
@@ -585,6 +584,7 @@ class HDPWIN22StackAdvisor(HDPWIN21StackAdvisor):
putTezProperty("tez.task.resource.memory.mb", taskResourceMemory)
putTezProperty("tez.runtime.io.sort.mb", min(int(taskResourceMemory * 0.4), 2047))
putTezProperty("tez.runtime.unordered.output.buffer.size-mb", int(taskResourceMemory * 0.075))
+ putTezProperty("tez.session.am.dag.submit.timeout.secs", "600")
def getServiceConfigurationValidators(self):
parentValidators = super(HDPWIN22StackAdvisor, self).getServiceConfigurationValidators()
http://git-wip-us.apache.org/repos/asf/ambari/blob/27aea4ce/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 64166fc..46f58ad 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
@@ -89,7 +89,8 @@ class TestHDP22StackAdvisor(TestCase):
"tez.am.resource.memory.mb": "4000",
"tez.task.resource.memory.mb": "768",
"tez.runtime.io.sort.mb": "307",
- "tez.runtime.unordered.output.buffer.size-mb": "57"
+ "tez.runtime.unordered.output.buffer.size-mb": "57",
+ 'tez.session.am.dag.submit.timeout.secs': '600'
}
},
'yarn-site': {
@@ -124,7 +125,8 @@ class TestHDP22StackAdvisor(TestCase):
"tez.am.resource.memory.mb": "3100",
"tez.task.resource.memory.mb": "768",
"tez.runtime.io.sort.mb": "307",
- "tez.runtime.unordered.output.buffer.size-mb": "57"
+ "tez.runtime.unordered.output.buffer.size-mb": "57",
+ 'tez.session.am.dag.submit.timeout.secs': '600'
}
},
'yarn-site': {
@@ -159,7 +161,8 @@ class TestHDP22StackAdvisor(TestCase):
"tez.am.resource.memory.mb": "4000",
"tez.task.resource.memory.mb": "760",
"tez.runtime.io.sort.mb": "304",
- "tez.runtime.unordered.output.buffer.size-mb": "57"
+ "tez.runtime.unordered.output.buffer.size-mb": "57",
+ 'tez.session.am.dag.submit.timeout.secs': '600'
}
},
'yarn-site': {
@@ -1009,8 +1012,7 @@ class TestHDP22StackAdvisor(TestCase):
'hive.server2.enable.doAs': 'true',
'hive.server2.tez.default.queues': "queue1,queue2",
'hive.server2.tez.initialize.default.sessions': 'false',
- 'hive.server2.tez.sessions.per.default.queue': '1',
- 'tez.session.am.dag.submit.timeout.secs': '600'
+ 'hive.server2.tez.sessions.per.default.queue': '1'
},
'property_attributes': {
'hive.server2.tez.default.queues': {