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 1AD00178C1 for ; Mon, 29 Sep 2014 22:12:01 +0000 (UTC) Received: (qmail 74338 invoked by uid 500); 29 Sep 2014 22:12:00 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 74275 invoked by uid 500); 29 Sep 2014 22:12:00 -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 74266 invoked by uid 99); 29 Sep 2014 22:12:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2014 22:12:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5CDB2A0260F; Mon, 29 Sep 2014 22:12:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonli@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: HADOOP-11130. NFS updateMaps OS check is reversed. Contributed by Brandon Li Date: Mon, 29 Sep 2014 22:12:00 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 758fb8465 -> aa3d6d374 HADOOP-11130. NFS updateMaps OS check is reversed. Contributed by Brandon Li (cherry picked from commit c88c6c57aa79e8a1f33d2e075491656f472c858b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aa3d6d37 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aa3d6d37 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aa3d6d37 Branch: refs/heads/branch-2 Commit: aa3d6d374d2dfa18d2ccd1bce40945ebcc248476 Parents: 758fb84 Author: Brandon Li Authored: Mon Sep 29 15:05:43 2014 -0700 Committer: Brandon Li Committed: Mon Sep 29 15:08:19 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa3d6d37/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 b2592e5..2851a79 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -425,6 +425,8 @@ Release 2.6.0 - UNRELEASED HADOOP-1110. JavaKeystoreProvider should not report a key as created if it was not flushed to the backing file. + HADOOP-11130. NFS updateMaps OS check is reversed (brandonli) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HADOOP-10734. Implement high-performance secure random number sources. http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa3d6d37/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java index 1a7a3f4..0098b47 100644 --- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java +++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java @@ -45,8 +45,8 @@ public class IdUserGroup { private final static String OS = System.getProperty("os.name"); /** Shell commands to get users and groups */ - static final String LINUX_GET_ALL_USERS_CMD = "getent passwd | cut -d: -f1,3"; - static final String LINUX_GET_ALL_GROUPS_CMD = "getent group | cut -d: -f1,3"; + static final String GET_ALL_USERS_CMD = "getent passwd | cut -d: -f1,3"; + static final String GET_ALL_GROUPS_CMD = "getent group | cut -d: -f1,3"; static final String MAC_GET_ALL_USERS_CMD = "dscl . -list /Users UniqueID"; static final String MAC_GET_ALL_GROUPS_CMD = "dscl . -list /Groups PrimaryGroupID"; @@ -223,16 +223,15 @@ public class IdUserGroup { + "' does not exist."); } - if (OS.startsWith("Linux")) { - updateMapInternal(uMap, "user", LINUX_GET_ALL_USERS_CMD, ":", + if (OS.startsWith("Mac")) { + updateMapInternal(uMap, "user", MAC_GET_ALL_USERS_CMD, "\\s+", staticMapping.uidMapping); - updateMapInternal(gMap, "group", LINUX_GET_ALL_GROUPS_CMD, ":", + updateMapInternal(gMap, "group", MAC_GET_ALL_GROUPS_CMD, "\\s+", staticMapping.gidMapping); } else { - // Mac - updateMapInternal(uMap, "user", MAC_GET_ALL_USERS_CMD, "\\s+", + updateMapInternal(uMap, "user", GET_ALL_USERS_CMD, ":", staticMapping.uidMapping); - updateMapInternal(gMap, "group", MAC_GET_ALL_GROUPS_CMD, "\\s+", + updateMapInternal(gMap, "group", GET_ALL_GROUPS_CMD, ":", staticMapping.gidMapping); }