Repository: ambari Updated Branches: refs/heads/branch-2.4 29d539af7 -> 2edb8831c refs/heads/trunk e18718a8c -> 05c12d51f
AMBARI-17062. Namenode failed to start while installing a cluster from UI (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05c12d51 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05c12d51 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05c12d51 Branch: refs/heads/trunk Commit: 05c12d51f8d1ca2716cad60af5701f38321931e3 Parents: e18718a Author: Andrew Onishuk <[email protected]> Authored: Wed Jun 8 15:23:38 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Wed Jun 8 15:23:38 2016 +0300 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari_server/serverSetup.py | 7 +++++-- .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 2 +- .../common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml | 1 + .../YARN/2.1.0.2.0/configuration/yarn-log4j.xml | 4 ++-- .../stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml | 1 + .../stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml | 1 + .../stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml | 4 ++-- 7 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/05c12d51/ambari-server/src/main/python/ambari_server/serverSetup.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py index d862411..dad3083 100644 --- a/ambari-server/src/main/python/ambari_server/serverSetup.py +++ b/ambari-server/src/main/python/ambari_server/serverSetup.py @@ -747,7 +747,8 @@ class JDKSetupLinux(JDKSetup): self.CREATE_JDK_DIR_CMD = "/bin/mkdir -p {0}" self.CHMOD_JDK_DIR_CMD = "chmod a+x {0}" self.SET_JCE_PERMISSIONS = "chown {0} {1}/{2}/*" - + self.SET_JCE_JAR_MODE = "chmod 664 {0}/{1}/{2}" + self.SET_JCE_FILE_MODE = "chmod 644 {0}/{1}/{2}" # use --no-same-owner when running as root to prevent uucp as the user (AMBARI-6478) self.UNTAR_JDK_ARCHIVE = "tar --no-same-owner -xvf {0}" @@ -785,7 +786,9 @@ class JDKSetupLinux(JDKSetup): def adjust_jce_permissions(self, jdk_path): ambari_user = read_ambari_user() - cmd = self.SET_JCE_PERMISSIONS.format(ambari_user, jdk_path,configDefaults.JDK_SECURITY_DIR) + cmd = self.SET_JCE_PERMISSIONS.format(ambari_user, jdk_path, configDefaults.JDK_SECURITY_DIR) + cmd += " && " + self.SET_JCE_FILE_MODE.format(jdk_path, configDefaults.JDK_SECURITY_DIR, "*") + cmd += " && " + self.SET_JCE_JAR_MODE.format(jdk_path, configDefaults.JDK_SECURITY_DIR, "*.jar") process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, http://git-wip-us.apache.org/repos/asf/ambari/blob/05c12d51/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml index 0501957..b12400a 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml @@ -346,7 +346,7 @@ export HADOOP_SECURE_DN_PID_DIR={{hadoop_pid_dir_prefix}}/$HADOOP_SECURE_DN_USER # History server pid export HADOOP_MAPRED_PID_DIR={{mapred_pid_dir_prefix}}/$USER -YARN_RESOURCEMANAGER_OPTS="-Dyarn.server.resourcemanager.appsummary.logger=INFO,RMSUMMARY" +YARN_RESOURCEMANAGER_OPTS="-Dyarn.server.resourcemanager.appsummary.logger=INFO,RMSUMMARY -Drm.audit.logger=INFO,RMAUDIT" # A string representing this instance of hadoop. $USER by default. export HADOOP_IDENT_STRING=$USER http://git-wip-us.apache.org/repos/asf/ambari/blob/05c12d51/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml index 9aa852b..acc3cd3 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml @@ -240,6 +240,7 @@ YARN_OPTS="$YARN_OPTS -Dyarn.home.dir=$YARN_COMMON_HOME" YARN_OPTS="$YARN_OPTS -Dyarn.id.str=$YARN_IDENT_STRING" YARN_OPTS="$YARN_OPTS -Dhadoop.root.logger=${YARN_ROOT_LOGGER:-INFO,console}" YARN_OPTS="$YARN_OPTS -Dyarn.root.logger=${YARN_ROOT_LOGGER:-INFO,console}" +YARN_OPTS="$YARN_OPTS -Drm.audit.logger=INFO,RMAUDIT -Dnm.audit.logger=INFO,NMAUDIT" if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then YARN_OPTS="$YARN_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH" fi http://git-wip-us.apache.org/repos/asf/ambari/blob/05c12d51/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml index 7fded04..43af74f 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-log4j.xml @@ -66,7 +66,7 @@ log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$Applicat log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=false # Audit logging for ResourceManager -rm.audit.logger=INFO,RMAUDIT +rm.audit.logger=${hadoop.root.logger} log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAuditLogger=${rm.audit.logger} log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAuditLogger=false log4j.appender.RMAUDIT=org.apache.log4j.DailyRollingFileAppender @@ -76,7 +76,7 @@ log4j.appender.RMAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n log4j.appender.RMAUDIT.DatePattern=.yyyy-MM-dd # Audit logging for NodeManager -nm.audit.logger=INFO,NMAUDIT +nm.audit.logger=${hadoop.root.logger} log4j.logger.org.apache.hadoop.yarn.server.nodemanager.NMAuditLogger=${nm.audit.logger} log4j.additivity.org.apache.hadoop.yarn.server.nodemanager.NMAuditLogger=false log4j.appender.NMAUDIT=org.apache.log4j.DailyRollingFileAppender http://git-wip-us.apache.org/repos/asf/ambari/blob/05c12d51/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml index 8cf516c..99f07eb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-env.xml @@ -146,6 +146,7 @@ YARN_OPTS="$YARN_OPTS -Dyarn.home.dir=$YARN_COMMON_HOME" YARN_OPTS="$YARN_OPTS -Dyarn.id.str=$YARN_IDENT_STRING" YARN_OPTS="$YARN_OPTS -Dhadoop.root.logger=${YARN_ROOT_LOGGER:-INFO,console}" YARN_OPTS="$YARN_OPTS -Dyarn.root.logger=${YARN_ROOT_LOGGER:-INFO,console}" +YARN_OPTS="$YARN_OPTS -Drm.audit.logger=INFO,RMAUDIT -Dnm.audit.logger=INFO,NMAUDIT" if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then YARN_OPTS="$YARN_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH" fi http://git-wip-us.apache.org/repos/asf/ambari/blob/05c12d51/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml index b517f91..b6a1f37 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml @@ -147,6 +147,7 @@ YARN_OPTS="$YARN_OPTS -Dyarn.id.str=$YARN_IDENT_STRING" YARN_OPTS="$YARN_OPTS -Dhadoop.root.logger=${YARN_ROOT_LOGGER:-INFO,console}" YARN_OPTS="$YARN_OPTS -Dyarn.root.logger=${YARN_ROOT_LOGGER:-INFO,console}" + YARN_OPTS="$YARN_OPTS -Drm.audit.logger=INFO,RMAUDIT -Dnm.audit.logger=INFO,NMAUDIT" if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then YARN_OPTS="$YARN_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH" fi http://git-wip-us.apache.org/repos/asf/ambari/blob/05c12d51/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml index ef84187..a2bded7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml @@ -75,7 +75,7 @@ log4j.appender.EWMA.messageAgeLimitSeconds=${yarn.ewma.messageAgeLimitSeconds} log4j.appender.EWMA.maxUniqueMessages=${yarn.ewma.maxUniqueMessages} # Audit logging for ResourceManager -rm.audit.logger=INFO,RMAUDIT +rm.audit.logger=${hadoop.root.logger} log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAuditLogger=${rm.audit.logger} log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAuditLogger=false log4j.appender.RMAUDIT=org.apache.log4j.DailyRollingFileAppender @@ -85,7 +85,7 @@ log4j.appender.RMAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n log4j.appender.RMAUDIT.DatePattern=.yyyy-MM-dd # Audit logging for NodeManager -nm.audit.logger=INFO,NMAUDIT +nm.audit.logger=${hadoop.root.logger} log4j.logger.org.apache.hadoop.yarn.server.nodemanager.NMAuditLogger=${nm.audit.logger} log4j.additivity.org.apache.hadoop.yarn.server.nodemanager.NMAuditLogger=false log4j.appender.NMAUDIT=org.apache.log4j.DailyRollingFileAppender
