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 9B452119D0 for ; Wed, 3 Sep 2014 22:49:24 +0000 (UTC) Received: (qmail 42318 invoked by uid 500); 3 Sep 2014 22:49:16 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 42026 invoked by uid 500); 3 Sep 2014 22:49:15 -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 40210 invoked by uid 99); 3 Sep 2014 22:49:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2014 22:49:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C73379B2949; Wed, 3 Sep 2014 22:49:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jing9@apache.org To: common-commits@hadoop.apache.org Date: Wed, 03 Sep 2014 22:49:37 -0000 Message-Id: <9c6caed0d69642b9a966a619905847fc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/50] [abbrv] git commit: HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration doesn't decode url correctly. Contributed by Yongjun Zhang. HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration doesn't decode url correctly. Contributed by Yongjun Zhang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6066b1a4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6066b1a4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6066b1a4 Branch: refs/heads/HDFS-6584 Commit: 6066b1a4551bb70bba2789ac05bf9ddbe72c10e8 Parents: 93010fa Author: Andrew Wang Authored: Fri Aug 29 15:47:01 2014 -0700 Committer: Andrew Wang Committed: Fri Aug 29 15:47:01 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/security/TestRefreshUserMappings.java | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6066b1a4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 88b19d8..3184e68 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -577,6 +577,9 @@ Release 2.6.0 - UNRELEASED HDFS-6800. Support Datanode layout changes with rolling upgrade. (James Thomas via Arpit Agarwal) + HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration + doesn't decode url correctly. (Yongjun Zhang via wang) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HDFS-6387. HDFS CLI admin tool for creating & deleting an http://git-wip-us.apache.org/repos/asf/hadoop/blob/6066b1a4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java index 72776e0..ca67245 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestRefreshUserMappings.java @@ -30,7 +30,9 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.net.URL; +import java.net.URLDecoder; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -225,15 +227,17 @@ public class TestRefreshUserMappings { } private void addNewConfigResource(String rsrcName, String keyGroup, - String groups, String keyHosts, String hosts) throws FileNotFoundException { + String groups, String keyHosts, String hosts) + throws FileNotFoundException, UnsupportedEncodingException { // location for temp resource should be in CLASSPATH Configuration conf = new Configuration(); URL url = conf.getResource("hdfs-site.xml"); - Path p = new Path(url.getPath()); + + String urlPath = URLDecoder.decode(url.getPath().toString(), "UTF-8"); + Path p = new Path(urlPath); Path dir = p.getParent(); tempResource = dir.toString() + "/" + rsrcName; - - + String newResource = ""+ "" + keyGroup + ""+groups+"" +