ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject git commit: AMBARI-5209. MapReduce2 Client Install fails after cluster upgrade. (swagle)
Date Tue, 25 Mar 2014 22:02:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.5.0 fa2985a85 -> 28da755da


AMBARI-5209. MapReduce2 Client Install fails after cluster upgrade. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28da755d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28da755d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28da755d

Branch: refs/heads/branch-1.5.0
Commit: 28da755dafca385ad4889bf3b5adfb2db0b0395d
Parents: fa2985a
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue Mar 25 10:59:02 2014 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue Mar 25 15:02:44 2014 -0700

----------------------------------------------------------------------
 .../stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py    | 2 +-
 .../stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py    | 2 +-
 .../stacks/HDP/2.0.6/services/YARN/package/scripts/params.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/28da755d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
index 2213392..65d5e66 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
@@ -22,7 +22,7 @@ from resource_management.core.system import System
 config = Script.get_config()
 
 user_group = config['configurations']['global']["user_group"]
-ganglia_conf_dir = config['configurations']['global']["ganglia_conf_dir"]
+ganglia_conf_dir = default("/configurations/global/ganglia_conf_dir","/etc/ganglia/hdp")
 ganglia_dir = "/etc/ganglia"
 ganglia_runtime_dir = config['configurations']['global']["ganglia_runtime_dir"]
 ganglia_shell_cmds_dir = "/usr/libexec/hdp/ganglia"

http://git-wip-us.apache.org/repos/asf/ambari/blob/28da755d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index c9997df..d7f6e41 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -22,7 +22,7 @@ from resource_management.core.system import System
 config = Script.get_config()
 
 user_group = config['configurations']['global']["user_group"]
-ganglia_conf_dir = "/etc/ganglia/hdp"
+ganglia_conf_dir = default("/configurations/global/ganglia_conf_dir","/etc/ganglia/hdp")
 ganglia_dir = "/etc/ganglia"
 ganglia_runtime_dir = config['configurations']['global']["ganglia_runtime_dir"]
 ganglia_shell_cmds_dir = "/usr/libexec/hdp/ganglia"

http://git-wip-us.apache.org/repos/asf/ambari/blob/28da755d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
index f32223f..64e8f81 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
@@ -89,7 +89,7 @@ yarn_container_bin = "/usr/lib/hadoop-yarn/bin"
 
 #exclude file
 exclude_hosts = default("/clusterHostInfo/decom_nm_hosts", [])
-exclude_file_path = config['configurations']['yarn-site']['yarn.resourcemanager.nodes.exclude-path']
+exclude_file_path = default("/configurations/yarn-site/yarn.resourcemanager.nodes.exclude-path","/etc/hadoop/conf/yarn.exclude")
 
 hostname = config['hostname']
 


Mime
View raw message