Repository: ambari Updated Branches: refs/heads/trunk d3b96c6dc -> a63f9e6dc
AMBARI-6016 - On Exception, database connection password is printed to log Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a63f9e6d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a63f9e6d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a63f9e6d Branch: refs/heads/trunk Commit: a63f9e6dc44664c0ec3484f8ff628008e40261b1 Parents: d3b96c6 Author: Artem Baranchuk <[email protected]> Authored: Wed Jun 4 00:50:38 2014 +0300 Committer: Artem Baranchuk <[email protected]> Committed: Wed Jun 4 15:53:47 2014 +0300 ---------------------------------------------------------------------- ambari-agent/src/main/python/resource_management/core/shell.py | 2 +- .../stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a63f9e6d/ambari-agent/src/main/python/resource_management/core/shell.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/resource_management/core/shell.py b/ambari-agent/src/main/python/resource_management/core/shell.py index e6644f4..80e2a38 100644 --- a/ambari-agent/src/main/python/resource_management/core/shell.py +++ b/ambari-agent/src/main/python/resource_management/core/shell.py @@ -86,7 +86,7 @@ def _call(command, logoutput=False, throw_on_failure=True, Logger.info(out) if throw_on_failure and code: - err_msg = ("Execution of '%s' returned %d. %s") % (command[-1], code, out) + err_msg = Logger.get_protected_text(("Execution of '%s' returned %d. %s") % (command[-1], code, out)) raise Fail(err_msg) return code, out http://git-wip-us.apache.org/repos/asf/ambari/blob/a63f9e6d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py index 1c65439..fc3e6bf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py @@ -96,13 +96,13 @@ def hive(name=None): "{hive_bin}/schematool -initSchema " "-dbType {hive_metastore_db_type} " "-userName {hive_metastore_user_name} " - "-passWord {hive_metastore_user_passwd}") + "-passWord {hive_metastore_user_passwd!p}") check_schema_created_cmd = format("export HIVE_CONF_DIR={hive_config_dir} ; " "{hive_bin}/schematool -info " "-dbType {hive_metastore_db_type} " "-userName {hive_metastore_user_name} " - "-passWord {hive_metastore_user_passwd}") + "-passWord {hive_metastore_user_passwd!p}") Execute(create_schema_cmd, not_if = check_schema_created_cmd
