Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 771FD200AC8 for ; Tue, 24 May 2016 01:20:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 75C0F160A2B; Mon, 23 May 2016 23:20:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C7E66160A0E for ; Tue, 24 May 2016 01:20:49 +0200 (CEST) Received: (qmail 24798 invoked by uid 500); 23 May 2016 23:20:40 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 23281 invoked by uid 99); 23 May 2016 23:20:40 -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; Mon, 23 May 2016 23:20:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35FA6E5720; Mon, 23 May 2016 23:20:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Mon, 23 May 2016 23:21:08 -0000 Message-Id: <5eeae921c60042678e1c0779e94e008d@git.apache.org> In-Reply-To: <0183e187a76049c1b5e83355610edae2@git.apache.org> References: <0183e187a76049c1b5e83355610edae2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] hadoop git commit: HDFS-10417. Improve error message from checkBlockLocalPathAccess. Contributed by Tianyin Xu. archived-at: Mon, 23 May 2016 23:20:50 -0000 HDFS-10417. Improve error message from checkBlockLocalPathAccess. Contributed by Tianyin Xu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/204de430 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/204de430 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/204de430 Branch: refs/heads/HDFS-1312 Commit: 204de430bf6a931e5688789c7a783c9c568a98c2 Parents: feb90ff Author: Kihwal Lee Authored: Thu May 19 15:52:32 2016 -0500 Committer: Kihwal Lee Committed: Thu May 19 15:52:32 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 3 ++- .../hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/204de430/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index 288fc3e..410472e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -1717,7 +1717,8 @@ public class DataNode extends ReconfigurableBase throw new AccessControlException( "Can't continue with getBlockLocalPathInfo() " + "authorization. The user " + currentUser - + " is not allowed to call getBlockLocalPathInfo"); + + " is not configured in " + + DFSConfigKeys.DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/204de430/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java index 299865b..067b8ce 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java @@ -375,10 +375,12 @@ public class TestShortCircuitLocalRead { try { proxy.getBlockLocalPathInfo(blk, token); Assert.fail("The call should have failed as this user " - + " is not allowed to call getBlockLocalPathInfo"); + + " is not configured in " + + DFSConfigKeys.DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY); } catch (IOException ex) { Assert.assertTrue(ex.getMessage().contains( - "not allowed to call getBlockLocalPathInfo")); + "not configured in " + + DFSConfigKeys.DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY)); } } finally { fs.close(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org