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/12 23:45:39 UTC
ambari git commit: AMBARI-11870. HDP-2.3 'hive.tez.java.opts' should
not contain Xmx and add additional JDK1.8 params - extra check (srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 795694188 -> ae9562aa2
AMBARI-11870. HDP-2.3 'hive.tez.java.opts' should not contain Xmx and add additional JDK1.8 params - extra check (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae9562aa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae9562aa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae9562aa
Branch: refs/heads/branch-2.1
Commit: ae9562aa25107b2d3a56591490d49f4aa311daf8
Parents: 7956941
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Jun 12 14:28:02 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Jun 12 14:44:20 2015 -0700
----------------------------------------------------------------------
.../src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae9562aa/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 7085c4d..1c099fd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -626,7 +626,8 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
defaultValue = recommendedDefaults[propertyName]
if defaultValue is None:
return self.getErrorItem("Config's default value can't be null or undefined")
- if not checkXmxValueFormat(value):
+ if not checkXmxValueFormat(value) and checkXmxValueFormat(defaultValue):
+ # Xmx is in the default-value but not the value, should be an error
return self.getErrorItem('Invalid value format')
if not checkXmxValueFormat(defaultValue):
# if default value does not contain Xmx, then there is no point in validating existing value