You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/05/09 23:54:40 UTC
[1/5] hadoop git commit: HDFS-13537. TestHdfsHelper does not generate
jceks path properly for relative path in Windows. Contributed by Xiao Liang.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 3cb9888d5 -> a756d3e7c
refs/heads/branch-2.9 d35351674 -> 212633737
refs/heads/branch-3.0 1049e180a -> e466b4e2a
refs/heads/branch-3.1 c649c7656 -> e3ff9e36d
refs/heads/trunk 1cfe7506f -> 914b98a71
HDFS-13537. TestHdfsHelper does not generate jceks path properly for relative path in Windows. Contributed by Xiao Liang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/914b98a7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/914b98a7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/914b98a7
Branch: refs/heads/trunk
Commit: 914b98a713f70667d4380ac752f6c4de931520d9
Parents: 1cfe750
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 9 16:52:09 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 9 16:52:09 2018 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/hadoop/test/TestHdfsHelper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/914b98a7/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
index 62f1972..40650a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
@@ -163,8 +163,10 @@ public class TestHdfsHelper extends TestDirHelper {
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_XATTRS_ENABLED_KEY, true);
FileSystemTestHelper helper = new FileSystemTestHelper();
+ Path targetFile = new Path(new File(helper.getTestRootDir())
+ .getAbsolutePath(), "test.jks");
final String jceksPath = JavaKeyStoreProvider.SCHEME_NAME + "://file" +
- new Path(helper.getTestRootDir(), "test.jks").toUri();
+ targetFile.toUri();
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
jceksPath);
MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: HDFS-13537. TestHdfsHelper does not generate
jceks path properly for relative path in Windows. Contributed by Xiao Liang.
Posted by in...@apache.org.
HDFS-13537. TestHdfsHelper does not generate jceks path properly for relative path in Windows. Contributed by Xiao Liang.
(cherry picked from commit 914b98a713f70667d4380ac752f6c4de931520d9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e466b4e2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e466b4e2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e466b4e2
Branch: refs/heads/branch-3.0
Commit: e466b4e2a74592db1546f8e11f457bdd1ff352dc
Parents: 1049e18
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 9 16:52:09 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 9 16:53:09 2018 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/hadoop/test/TestHdfsHelper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e466b4e2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
index 62f1972..40650a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
@@ -163,8 +163,10 @@ public class TestHdfsHelper extends TestDirHelper {
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_XATTRS_ENABLED_KEY, true);
FileSystemTestHelper helper = new FileSystemTestHelper();
+ Path targetFile = new Path(new File(helper.getTestRootDir())
+ .getAbsolutePath(), "test.jks");
final String jceksPath = JavaKeyStoreProvider.SCHEME_NAME + "://file" +
- new Path(helper.getTestRootDir(), "test.jks").toUri();
+ targetFile.toUri();
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
jceksPath);
MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HDFS-13537. TestHdfsHelper does not generate
jceks path properly for relative path in Windows. Contributed by Xiao Liang.
Posted by in...@apache.org.
HDFS-13537. TestHdfsHelper does not generate jceks path properly for relative path in Windows. Contributed by Xiao Liang.
(cherry picked from commit 914b98a713f70667d4380ac752f6c4de931520d9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a756d3e7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a756d3e7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a756d3e7
Branch: refs/heads/branch-2
Commit: a756d3e7c8eb573406d30593e761654fa77ee010
Parents: 3cb9888
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 9 16:52:09 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 9 16:53:45 2018 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/hadoop/test/TestHdfsHelper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a756d3e7/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
index 0e701f7..f57092d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
@@ -157,8 +157,10 @@ public class TestHdfsHelper extends TestDirHelper {
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_XATTRS_ENABLED_KEY, true);
FileSystemTestHelper helper = new FileSystemTestHelper();
+ Path targetFile = new Path(new File(helper.getTestRootDir())
+ .getAbsolutePath(), "test.jks");
final String jceksPath = JavaKeyStoreProvider.SCHEME_NAME + "://file" +
- new Path(helper.getTestRootDir(), "test.jks").toUri();
+ targetFile.toUri();
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
jceksPath);
MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: HDFS-13537. TestHdfsHelper does not generate
jceks path properly for relative path in Windows. Contributed by Xiao Liang.
Posted by in...@apache.org.
HDFS-13537. TestHdfsHelper does not generate jceks path properly for relative path in Windows. Contributed by Xiao Liang.
(cherry picked from commit 914b98a713f70667d4380ac752f6c4de931520d9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e3ff9e36
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e3ff9e36
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e3ff9e36
Branch: refs/heads/branch-3.1
Commit: e3ff9e36dfcc82d8bf9fea46800625b8a7a9c0da
Parents: c649c76
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 9 16:52:09 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 9 16:52:45 2018 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/hadoop/test/TestHdfsHelper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3ff9e36/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
index 62f1972..40650a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
@@ -163,8 +163,10 @@ public class TestHdfsHelper extends TestDirHelper {
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_XATTRS_ENABLED_KEY, true);
FileSystemTestHelper helper = new FileSystemTestHelper();
+ Path targetFile = new Path(new File(helper.getTestRootDir())
+ .getAbsolutePath(), "test.jks");
final String jceksPath = JavaKeyStoreProvider.SCHEME_NAME + "://file" +
- new Path(helper.getTestRootDir(), "test.jks").toUri();
+ targetFile.toUri();
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
jceksPath);
MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HDFS-13537. TestHdfsHelper does not generate
jceks path properly for relative path in Windows. Contributed by Xiao Liang.
Posted by in...@apache.org.
HDFS-13537. TestHdfsHelper does not generate jceks path properly for relative path in Windows. Contributed by Xiao Liang.
(cherry picked from commit 914b98a713f70667d4380ac752f6c4de931520d9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/21263373
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/21263373
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/21263373
Branch: refs/heads/branch-2.9
Commit: 212633737e5f110b20ba412d37069d8f172dae8e
Parents: d353516
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 9 16:52:09 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 9 16:54:01 2018 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/hadoop/test/TestHdfsHelper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/21263373/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
index 0e701f7..f57092d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java
@@ -157,8 +157,10 @@ public class TestHdfsHelper extends TestDirHelper {
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_XATTRS_ENABLED_KEY, true);
FileSystemTestHelper helper = new FileSystemTestHelper();
+ Path targetFile = new Path(new File(helper.getTestRootDir())
+ .getAbsolutePath(), "test.jks");
final String jceksPath = JavaKeyStoreProvider.SCHEME_NAME + "://file" +
- new Path(helper.getTestRootDir(), "test.jks").toUri();
+ targetFile.toUri();
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
jceksPath);
MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org