Преглед изворни кода

YARN-5679. TestAHSWebServices is failing (ajisakaa via rkanter)

Robert Kanter пре 8 година
родитељ
комит
23d7d53a41

+ 4 - 3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java

@@ -97,7 +97,9 @@ public class AggregatedLogFormat {
    */
    */
   private static final FsPermission APP_LOG_FILE_UMASK = FsPermission
   private static final FsPermission APP_LOG_FILE_UMASK = FsPermission
       .createImmutable((short) (0640 ^ 0777));
       .createImmutable((short) (0640 ^ 0777));
-
+  /** Default permission for the log file. */
+  private static final FsPermission APP_LOG_FILE_PERM =
+      FsPermission.getFileDefault().applyUMask(APP_LOG_FILE_UMASK);
 
 
   static {
   static {
     RESERVED_KEYS = new HashMap<String, AggregatedLogFormat.LogKey>();
     RESERVED_KEYS = new HashMap<String, AggregatedLogFormat.LogKey>();
@@ -458,11 +460,10 @@ public class AggregatedLogFormat {
               @Override
               @Override
               public FSDataOutputStream run() throws Exception {
               public FSDataOutputStream run() throws Exception {
                 fc = FileContext.getFileContext(remoteAppLogFile.toUri(), conf);
                 fc = FileContext.getFileContext(remoteAppLogFile.toUri(), conf);
-                fc.setUMask(APP_LOG_FILE_UMASK);
                 return fc.create(
                 return fc.create(
                     remoteAppLogFile,
                     remoteAppLogFile,
                     EnumSet.of(CreateFlag.CREATE, CreateFlag.OVERWRITE),
                     EnumSet.of(CreateFlag.CREATE, CreateFlag.OVERWRITE),
-                    new Options.CreateOpts[] {});
+                    Options.CreateOpts.perms(APP_LOG_FILE_PERM));
               }
               }
             });
             });
       } catch (InterruptedException e) {
       } catch (InterruptedException e) {