Repository: ambari Updated Branches: refs/heads/trunk 799c09851 -> 12b00a4d9
AMBARI-15856. Getting WARNING on ambari server setup + start (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12b00a4d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12b00a4d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12b00a4d Branch: refs/heads/trunk Commit: 12b00a4d9959bb1648fbdf3d2883a496b8085783 Parents: 799c098 Author: Andrew Onishuk <[email protected]> Authored: Wed Apr 13 11:58:50 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Wed Apr 13 11:58:50 2016 +0300 ---------------------------------------------------------------------- .../src/main/python/ambari_server/serverClassPath.py | 7 ++++++- .../src/main/python/ambari_server/serverConfiguration.py | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/12b00a4d/ambari-server/src/main/python/ambari_server/serverClassPath.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverClassPath.py b/ambari-server/src/main/python/ambari_server/serverClassPath.py index fdc1c12..9257d49 100644 --- a/ambari-server/src/main/python/ambari_server/serverClassPath.py +++ b/ambari-server/src/main/python/ambari_server/serverClassPath.py @@ -33,7 +33,9 @@ AMBARI_SERVER_LIB = "AMBARI_SERVER_LIB" JDBC_DRIVER_PATH_PROPERTY = "server.jdbc.driver.path" JAR_FILE_PATTERN = re.compile(r'^(.*)(-\d.*\.jar$)') AMBARI_SERVER_JAR_FILE_PATTERN = re.compile(r'^ambari-server(-\d.*\.jar$)') - +JAR_DUPLICATES_TO_IGNORE = [ + 'javax.servlet.jsp.jstl', # org.eclipse.jetty dependency requires two different libraries with this name +] class ServerClassPath(): @@ -126,6 +128,9 @@ class ServerClassPath(): match = JAR_FILE_PATTERN.match(os.path.basename(jar)) if match: for group in match.groups(): + if group in JAR_DUPLICATES_TO_IGNORE: + break + if group in jar_names: err = "Multiple versions of {0}.jar found in java class path " \ "({1} and {2}). \n Make sure that you include only one " \ http://git-wip-us.apache.org/repos/asf/ambari/blob/12b00a4d/ambari-server/src/main/python/ambari_server/serverConfiguration.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py index d5a388f..80cf0c2 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -889,7 +889,8 @@ def store_password_file(password, filename): passFile.write(password) print_info_msg("Adjusting filesystem permissions") ambari_user = read_ambari_user() - set_file_permissions(passFilePath, "660", ambari_user, False) + if ambari_user: # at the first install ambari_user can be None. Which is fine since later on password.dat is chowned with the correct ownership. + set_file_permissions(passFilePath, "660", ambari_user, False) #Windows paths need double backslashes, otherwise the Ambari server deserializer will think the single \ are escape markers return passFilePath.replace('\\', '\\\\')
