svn commit: r1586569 - in /hadoop/common/branches/branch-2.4/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryServerFileSystemStateStoreService.java

[vinodkv]

Author: vinodkv
Date: Fri Apr 11 04:29:43 2014
New Revision: 1586569

URL: http://svn.apache.org/r1586569
Log:
MAPREDUCE-5826. Fixed HistoryServerFileSystemStore to use right permissions on 
Windows for temporary files and thus also fix the test-issue with
TestHistoryServerFileSystemStateStoreService. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1586567 ../../trunk/

Modified:
    hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryServerFileSystemStateStoreService.java

Modified: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt?rev=1586569&r1=1586568&r2=1586569&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt Fri 
Apr 11 04:29:43 2014
@@ -20,6 +20,10 @@ Release 2.4.1 - UNRELEASED
     MAPREDUCE-5815. Fixed test-failure of TestMRAppMaster by making MRAppMaster
     gracefully handle empty-queue names. (Akira Ajisaka via vinodkv)
 
+    MAPREDUCE-5826. Fixed HistoryServerFileSystemStore to use right permissions
+    on Windows for temporary files and thus also fix the test-issue with
+    TestHistoryServerFileSystemStateStoreService. (Varun Vasudev via vinodkv)
+
 Release 2.4.0 - 2014-04-07 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryServerFileSystemStateStoreService.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryServerFileSystemStateStoreService.java?rev=1586569&r1=1586568&r2=1586569&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryServerFileSystemStateStoreService.java
 (original)
+++ 
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryServerFileSystemStateStoreService.java
 Fri Apr 11 04:29:43 2014
@@ -41,6 +41,7 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapreduce.v2.api.MRDelegationTokenIdentifier;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
 import org.apache.hadoop.security.token.delegation.DelegationKey;
+import org.apache.hadoop.util.Shell;
 
 @Private
 @Unstable
@@ -65,8 +66,8 @@ public class HistoryServerFileSystemStat
   private static final String TMP_FILE_PREFIX = "tmp-";
   private static final FsPermission DIR_PERMISSIONS =
       new FsPermission((short)0700);
-  private static final FsPermission FILE_PERMISSIONS =
-      new FsPermission((short)0400);
+  private static final FsPermission FILE_PERMISSIONS = Shell.WINDOWS
+      ? new FsPermission((short) 0700) : new FsPermission((short) 0400);
   private static final int NUM_TOKEN_BUCKETS = 1000;
 
   private FileSystem fs;