AMBARI-19226: Provide default value for hdfs_tmp_dir parameter in params.py scripts (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/64f3b39b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64f3b39b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64f3b39b Branch: refs/heads/branch-dev-patch-upgrade Commit: 64f3b39ba3bcef59cdca94b3b29dde37feb0e7f0 Parents: d1317df Author: Di Li <[email protected]> Authored: Tue Dec 20 11:36:15 2016 -0500 Committer: Di Li <[email protected]> Committed: Tue Dec 20 11:36:15 2016 -0500 ---------------------------------------------------------------------- .../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 2 +- .../common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py | 2 +- .../common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py | 2 +- .../common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py | 2 +- .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 2 +- .../resources/stacks/HDP/3.0/hooks/before-START/scripts/params.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py index 7567ab4..b04fce3 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py @@ -92,7 +92,7 @@ dfs_http_policy = default('/configurations/hdfs-site/dfs.http.policy', None) dfs_dn_ipc_address = config['configurations']['hdfs-site']['dfs.datanode.ipc.address'] secure_dn_ports_are_in_use = False -hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir'] +hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp") namenode_backup_dir = default("/configurations/hadoop-env/namenode_backup_dir", "/tmp/upgrades") # hadoop default parameters http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py index 55544e0..512ca27 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py @@ -89,7 +89,7 @@ dfs_http_policy = default('/configurations/hdfs-site/dfs.http.policy', None) dfs_dn_ipc_address = config['configurations']['hdfs-site']['dfs.datanode.ipc.address'] secure_dn_ports_are_in_use = False -hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir'] +hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp") namenode_backup_dir = default("/configurations/hadoop-env/namenode_backup_dir", "/tmp/upgrades") # hadoop default parameters http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py index bebb375..6bf2927 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py @@ -143,7 +143,7 @@ ulimit_cmd = "ulimit -c unlimited;" mapred_user = status_params.mapred_user yarn_user = status_params.yarn_user hdfs_user = config['configurations']['hadoop-env']['hdfs_user'] -hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir'] +hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp") smokeuser = config['configurations']['cluster-env']['smokeuser'] smokeuser_principal = config['configurations']['cluster-env']['smokeuser_principal_name'] http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py index cdadc80..52cc1c5 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py @@ -143,7 +143,7 @@ ulimit_cmd = "ulimit -c unlimited;" mapred_user = status_params.mapred_user yarn_user = status_params.yarn_user hdfs_user = config['configurations']['hadoop-env']['hdfs_user'] -hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir'] +hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp") smokeuser = config['configurations']['cluster-env']['smokeuser'] smokeuser_principal = config['configurations']['cluster-env']['smokeuser_principal_name'] http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/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 daba3d3..b905c2b 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 @@ -44,7 +44,7 @@ dfs_type = default("/commandParams/dfs_type", "") hadoop_conf_dir = "/etc/hadoop/conf" component_list = default("/localComponents", []) -hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir'] +hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp") hadoop_metrics2_properties_content = config['configurations']['hadoop-metrics2.properties']['content'] http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/scripts/params.py index d838211..455710b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/scripts/params.py @@ -45,7 +45,7 @@ stack_root = Script.get_stack_root() hadoop_conf_dir = "/etc/hadoop/conf" component_list = default("/localComponents", []) -hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir'] +hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp") hadoop_metrics2_properties_content = config['configurations']['hadoop-metrics2.properties']['content']
