Repository: ambari Updated Branches: refs/heads/trunk 753a5b036 -> cf67fb9fe
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/cf67fb9f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cf67fb9f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cf67fb9f Branch: refs/heads/trunk Commit: cf67fb9fe16157ce10c0d6118f1a22000104aa6f Parents: 753a5b0 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Wed Jan 18 21:08:23 2017 +0200 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Wed Jan 18 21:08:23 2017 +0200 ---------------------------------------------------------------------- .../src/main/python/ambari_commons/os_linux.py | 6 +----- .../ambari/server/configuration/Configuration.java | 6 +++--- .../ambari/server/upgrade/AbstractUpgradeCatalog.java | 12 ++++++------ 3 files changed, 10 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cf67fb9f/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/cf67fb9f/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 7f047c8..35d16ba 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 @@ -2995,8 +2995,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(); @@ -3006,7 +3006,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/cf67fb9f/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 90a6ed6..31056b4 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 @@ -17,6 +17,11 @@ */ package org.apache.ambari.server.upgrade; +import javax.persistence.EntityManager; +import javax.xml.bind.JAXBException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + import java.io.File; import java.io.FileReader; import java.io.FilenameFilter; @@ -42,11 +47,6 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.EntityManager; -import javax.xml.bind.JAXBException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; @@ -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); }
