Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4057189F0 for ; Tue, 21 Jul 2015 02:23:59 +0000 (UTC) Received: (qmail 45399 invoked by uid 500); 21 Jul 2015 02:23:59 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 45330 invoked by uid 500); 21 Jul 2015 02:23:59 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 45321 invoked by uid 99); 21 Jul 2015 02:23:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2015 02:23:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8C554E10A9; Tue, 21 Jul 2015 02:23:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-12081. Fix UserGroupInformation.java to support 64-bit zLinux. (aajisaka) Date: Tue, 21 Jul 2015 02:23:59 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk d6d58606b -> 773c67094 HADOOP-12081. Fix UserGroupInformation.java to support 64-bit zLinux. (aajisaka) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/773c6709 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/773c6709 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/773c6709 Branch: refs/heads/trunk Commit: 773c670943757681feeafb227a2d0c29d48f38f1 Parents: d6d5860 Author: Akira Ajisaka Authored: Tue Jul 21 11:21:49 2015 +0900 Committer: Akira Ajisaka Committed: Tue Jul 21 11:21:49 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/773c6709/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 a23a508..ef8e238 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -705,6 +705,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/773c6709/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 be3d60d..80a0898 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 @@ -369,7 +369,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 */