You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/02/06 15:22:48 UTC
git commit: AMBARI-4547. DataNode start failed after enabling
security (aonishuk)
Updated Branches:
refs/heads/trunk 9ec612ca1 -> a68dd4b1a
AMBARI-4547. DataNode start failed after enabling security (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a68dd4b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a68dd4b1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a68dd4b1
Branch: refs/heads/trunk
Commit: a68dd4b1a82c56b9a44c977678deb9b3d618da51
Parents: 9ec612c
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Thu Feb 6 06:20:48 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Thu Feb 6 06:21:21 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a68dd4b1/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index 1f943df..1955a3c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -124,10 +124,12 @@ else:
#hadoop-env.sh
java_home = config['hostLevelParams']['java_home']
-if System.get_instance().os_family == "suse":
- jsvc_path = "/usr/lib/bigtop-utils"
-else:
+
+if config['hostLevelParams']['stack_version'] == '2.0.6' and System.get_instance().os_family != "suse":
+ # deprecated rhel jsvc_path
jsvc_path = "/usr/libexec/bigtop-utils"
+else:
+ jsvc_path = "/usr/lib/bigtop-utils"
hadoop_heapsize = config['configurations']['global']['hadoop_heapsize']
namenode_heapsize = config['configurations']['global']['namenode_heapsize']