ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject 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)
Date Fri, 12 Jun 2015 21:46:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk fbb8bc7da -> 102ef9c43


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/102ef9c4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/102ef9c4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/102ef9c4

Branch: refs/heads/trunk
Commit: 102ef9c439aaefd02ac2b743a9133fa07fcd2fc6
Parents: fbb8bc7
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Fri Jun 12 14:28:02 2015 -0700
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Fri Jun 12 14:46:12 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/102ef9c4/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


Mime
View raw message