Explorar o código

AMBARI-9493. Failed to start Datanode with non-default umask (aonishuk)

Andrew Onishuk %!s(int64=10) %!d(string=hai) anos
pai
achega
0b855e9a03

+ 3 - 1
ambari-server/src/main/python/ambari_server/serverSetup.py

@@ -667,6 +667,7 @@ class JDKSetupLinux(JDKSetup):
     self.JAVA_BIN = "java"
     self.JAVA_BIN = "java"
 
 
     self.CREATE_JDK_DIR_CMD = "/bin/mkdir -p {0}"
     self.CREATE_JDK_DIR_CMD = "/bin/mkdir -p {0}"
+    self.CHMOD_JDK_DIR_CMD = "chmod a+x {0}"
     self.MAKE_FILE_EXECUTABLE_CMD = "chmod a+x {0}"
     self.MAKE_FILE_EXECUTABLE_CMD = "chmod a+x {0}"
 
 
     # use --no-same-owner when running as root to prevent uucp as the user (AMBARI-6478)
     # use --no-same-owner when running as root to prevent uucp as the user (AMBARI-6478)
@@ -677,6 +678,7 @@ class JDKSetupLinux(JDKSetup):
     print "Installing JDK to {0}".format(jdk_inst_dir)
     print "Installing JDK to {0}".format(jdk_inst_dir)
 
 
     retcode, out, err = run_os_command(self.CREATE_JDK_DIR_CMD.format(jdk_inst_dir))
     retcode, out, err = run_os_command(self.CREATE_JDK_DIR_CMD.format(jdk_inst_dir))
+    retcode, out, err = run_os_command(self.CHMOD_JDK_DIR_CMD.format(jdk_inst_dir))
     savedPath = os.getcwd()
     savedPath = os.getcwd()
     os.chdir(jdk_inst_dir)
     os.chdir(jdk_inst_dir)
 
 
@@ -687,7 +689,7 @@ class JDKSetupLinux(JDKSetup):
       elif java_inst_file.endswith(".gz"):
       elif java_inst_file.endswith(".gz"):
         retcode, out, err = run_os_command(self.UNTAR_JDK_ARCHIVE.format(java_inst_file))
         retcode, out, err = run_os_command(self.UNTAR_JDK_ARCHIVE.format(java_inst_file))
       else:
       else:
-        err = "JDK installation failed.Unknown file mask."
+        err = "JDK installation failed.Unknown file extension."
         raise FatalException(1, err)
         raise FatalException(1, err)
     finally:
     finally:
       os.chdir(savedPath)
       os.chdir(savedPath)