Repository: hadoop
Updated Branches:
refs/heads/branch-2 21bb77f99 -> f6319b513
HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration
doesn't decode url correctly. Contributed by Yongjun Zhang.
(cherry picked from commit 6066b1a4551bb70bba2789ac05bf9ddbe72c10e8)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6319b51
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6319b51
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6319b51
Branch: refs/heads/branch-2
Commit: f6319b513129448a4304294e54e50b344dce52e0
Parents: 21bb77f
Author: Andrew Wang <[email protected]>
Authored: Fri Aug 29 15:47:01 2014 -0700
Committer: Andrew Wang <[email protected]>
Committed: Fri Aug 29 15:49:06 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/f6319b51/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 5414aea..6e385db 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -313,6 +313,9 @@ Release 2.6.0 - UNRELEASED
HDFS-6902. FileWriter should be closed in finally block in
BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe)
+ 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/f6319b51/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 =
"<configuration>"+
"<property><name>" + keyGroup +
"</name><value>"+groups+"</value></property>" +
