You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/06/02 15:20:54 UTC
ambari git commit: AMBARI-11594 - Hadoop Home Directory Should Be
Chosen Correctly During An Upgrade (part2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 1bb0a8dad -> cc0d68b98
AMBARI-11594 - Hadoop Home Directory Should Be Chosen Correctly During An Upgrade (part2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc0d68b9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc0d68b9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc0d68b9
Branch: refs/heads/trunk
Commit: cc0d68b98ffd54589b7c157e55a91260decaa34b
Parents: 1bb0a8d
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Jun 2 09:20:07 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Jun 2 09:20:47 2015 -0400
----------------------------------------------------------------------
.../ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc0d68b9/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index 76f1581..45fa367 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -18,14 +18,13 @@ limitations under the License.
"""
from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import hdp_select
from resource_management.libraries.resources.hdfs_resource import HdfsResource
from resource_management.libraries.functions import format
from resource_management.libraries.functions.version import format_hdp_stack_version
from resource_management.libraries.functions.default import default
from resource_management.libraries.script.script import Script
-
-
import status_params
# server configurations
@@ -36,6 +35,8 @@ exec_tmp_dir = status_params.tmp_dir
security_enabled = status_params.security_enabled
# hdp version
+stack_name = default("/hostLevelParams/stack_name", None)
+version = default("/commandParams/version", None)
stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
@@ -48,8 +49,8 @@ conf_dir = status_params.conf_dir
server_conf_dir = status_params.server_conf_dir
# service locations
-hadoop_prefix = "/usr/hdp/current/hadoop-client"
-hadoop_bin_dir = conf_select.get_hadoop_dir("bin")
+hadoop_prefix = hdp_select.get_hadoop_dir("home")
+hadoop_bin_dir = hdp_select.get_hadoop_dir("bin")
zookeeper_home = "/usr/hdp/current/zookeeper-client"
# the configuration direction for HDFS/YARN/MapR is the hadoop config