Repository: ambari Updated Branches: refs/heads/branch-2.5 8635714c1 -> f1123231c
AMBARI-19612. ambari-server setup failed.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f1123231 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1123231 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1123231 Branch: refs/heads/branch-2.5 Commit: f1123231c9d4333d40ba46e4154c8a2c8d97c61c Parents: 8635714 Author: Vitaly Brodetskyi <[email protected]> Authored: Wed Jan 18 20:39:40 2017 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Wed Jan 18 20:39:40 2017 +0200 ---------------------------------------------------------------------- ambari-common/src/main/python/ambari_commons/os_linux.py | 6 +----- .../org/apache/ambari/server/configuration/Configuration.java | 6 +++--- .../apache/ambari/server/upgrade/AbstractUpgradeCatalog.java | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f1123231/ambari-common/src/main/python/ambari_commons/os_linux.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/ambari_commons/os_linux.py b/ambari-common/src/main/python/ambari_commons/os_linux.py index 25368c6..60b9659 100644 --- a/ambari-common/src/main/python/ambari_commons/os_linux.py +++ b/ambari-common/src/main/python/ambari_commons/os_linux.py @@ -46,12 +46,8 @@ def os_run_os_command(cmd, env=None, shell=False, cwd=None): cwd=cwd, shell=shell ) - process_pid = process.pid + print_info_msg("\nprocess_pid=" + str(process.pid)) (stdoutdata, stderrdata) = process.communicate() - if stdoutdata: - stdoutdata = stdoutdata + "\nprocess_pid=" + str(process_pid) + "\n" - else: - stdoutdata = "\nprocess_pid=" + str(process_pid) + "\n" return process.returncode, stdoutdata, stderrdata def os_change_owner(filePath, user, recursive): http://git-wip-us.apache.org/repos/asf/ambari/blob/f1123231/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java index 9459d93..7d4d409 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java @@ -2570,8 +2570,8 @@ public class Configuration { } - public void wrtiteToAmbariUpgradeConfigUpdatesFile(Multimap<AbstractUpgradeCatalog.ConfigUpdateType, Entry<String, String>> propertiesToLog, - String configType, String serviceName, String wrtiteToAmbariUpgradeConfigUpdatesFile) { + public void writeToAmbariUpgradeConfigUpdatesFile(Multimap<AbstractUpgradeCatalog.ConfigUpdateType, Entry<String, String>> propertiesToLog, + String configType, String serviceName, String writeToAmbariUpgradeConfigUpdatesFile) { try { if (ambariUpgradeConfigUpdatesFilePath == null) { Properties log4jProperties = getLog4jProperties(); @@ -2581,7 +2581,7 @@ public class Configuration { logPath = StringUtils.replace(logPath, "${ambari.root.dir}", rootPath); logPath = StringUtils.replace(logPath, "//", "/"); if (StringUtils.isNotEmpty(logPath)) { - ambariUpgradeConfigUpdatesFilePath = logPath + File.separator + wrtiteToAmbariUpgradeConfigUpdatesFile; + ambariUpgradeConfigUpdatesFilePath = logPath + File.separator + writeToAmbariUpgradeConfigUpdatesFile; } } else { LOG.warn("Log4j properties are not available"); http://git-wip-us.apache.org/repos/asf/ambari/blob/f1123231/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java index 1a05b95..fe75e5d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java @@ -577,7 +577,7 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog { if (propertiesToLog.size() > 0) { try { - configuration.wrtiteToAmbariUpgradeConfigUpdatesFile(propertiesToLog, configType, serviceName, ambariUpgradeConfigUpdatesFileName); + configuration.writeToAmbariUpgradeConfigUpdatesFile(propertiesToLog, configType, serviceName, ambariUpgradeConfigUpdatesFileName); } catch(Exception e) { LOG.error("Write to config updates file failed:", e); }
