Repository: hadoop Updated Branches: refs/heads/branch-2 cadd02ad1 -> d591f2af5
HADOOP-12081. Fix UserGroupInformation.java to support 64-bit zLinux. (aajisaka) (cherry picked from commit 773c670943757681feeafb227a2d0c29d48f38f1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d591f2af Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d591f2af Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d591f2af Branch: refs/heads/branch-2 Commit: d591f2af5dd004a0851c34710b2084ea1b573952 Parents: cadd02a Author: Akira Ajisaka <[email protected]> Authored: Tue Jul 21 11:21:49 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Tue Jul 21 11:22:36 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/security/UserGroupInformation.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d591f2af/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f6f3c38..c044b8c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -202,6 +202,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11893. Mark org.apache.hadoop.security.token.Token as @InterfaceAudience.Public. (Brahma Reddy Battula via stevel) + HADOOP-12081. Fix UserGroupInformation.java to support 64-bit zLinux. + (aajisaka) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/d591f2af/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index 527ec2d..746d2ee 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -357,7 +357,8 @@ public class UserGroupInformation { private static final boolean windows = System.getProperty("os.name").startsWith("Windows"); private static final boolean is64Bit = - System.getProperty("os.arch").contains("64"); + System.getProperty("os.arch").contains("64") || + System.getProperty("os.arch").contains("s390x"); private static final boolean aix = System.getProperty("os.name").equals("AIX"); /* Return the OS login module class name */
