Repository: ambari Updated Branches: refs/heads/branch-1.5.0 b2dfa1a9c -> 24202913a
AMBARI-5178. After upgrade hdfs-site and other configs don't contain properties intoduced in 1.5.0 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bde70992 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bde70992 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bde70992 Branch: refs/heads/branch-1.5.0 Commit: bde70992eec4931218ff98b71c2be2b7a918c334 Parents: b2dfa1a Author: Andrew Onischuk <aonis...@hortonworks.com> Authored: Fri Mar 21 14:58:23 2014 -0700 Committer: Mahadev Konar <maha...@apache.org> Committed: Mon Mar 24 15:42:54 2014 -0700 ---------------------------------------------------------------------- .pydevproject | 7 +++++++ ambari-agent/.pydevproject | 13 +++++++++++++ .../HDP/2.0.6/services/HBASE/package/scripts/params.py | 1 + .../HDP/2.0.6/services/YARN/package/scripts/params.py | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/.pydevproject ---------------------------------------------------------------------- diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 0000000..a9cca03 --- /dev/null +++ b/.pydevproject @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?eclipse-pydev version="1.0"?> + +<pydev_project> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> +</pydev_project> http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/ambari-agent/.pydevproject ---------------------------------------------------------------------- diff --git a/ambari-agent/.pydevproject b/ambari-agent/.pydevproject new file mode 100644 index 0000000..2358a03 --- /dev/null +++ b/ambari-agent/.pydevproject @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?eclipse-pydev version="1.0"?> + +<pydev_project> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> +<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> +<path>/ambari-agent/src/main/python</path> +</pydev_pathproperty> +<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH"> +<path>/root/ambari/ambari-common/src/test/python</path> +</pydev_pathproperty> +</pydev_project> http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py index f999683..37d9278 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py @@ -53,6 +53,7 @@ regionserver_xmn_size = calc_xmn_from_xms(regionserver_heapsize, 0.2, 512) pid_dir = status_params.pid_dir tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir'] +# TODO UPGRADE default, update site during upgrade _local_dir_conf = default('/configurations/hbase-site/hbase.local.dir', "${hbase.tmp.dir}/local") local_dir = substitute_vars(_local_dir_conf, config['configurations']['hbase-site']) http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/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 a523a4f..f32223f 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 @@ -41,7 +41,8 @@ kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), " rm_host = config['clusterHostInfo']['rm_host'][0] rm_port = config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'].split(':')[-1] rm_https_port = "8090" -rm_nodes_exclude_path = config['configurations']['yarn-site']['yarn.resourcemanager.nodes.exclude-path'] +# TODO UPGRADE default, update site during upgrade +rm_nodes_exclude_path = default("/configurations/yarn-site/yarn.resourcemanager.nodes.exclude-path","/etc/hadoop/conf/yarn.exclude") java64_home = config['hostLevelParams']['java_home'] hadoop_ssl_enabled = default("/configurations/core-site/hadoop.ssl.enabled", False)
