HADOOP-11762. Enable swift distcp to secure HDFS (Chen He via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/68d1f4bf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/68d1f4bf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/68d1f4bf Branch: refs/heads/YARN-1197 Commit: 68d1f4bfe863761d3c83b79b17ec1194edca3172 Parents: cf74772 Author: Allen Wittenauer <a...@apache.org> Authored: Tue Jul 21 11:19:29 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Tue Jul 21 11:19:29 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../hadoop/fs/swift/snative/SwiftNativeFileSystem.java | 9 +++++++++ .../apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java | 7 +++++++ 3 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/68d1f4bf/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 24709e0..5b51bce 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -495,6 +495,8 @@ Trunk (Unreleased) HADOOP-12107. long running apps may have a huge number of StatisticsData instances under FileSystem (Sangjin Lee via Ming Ma) + HADOOP-11762. Enable swift distcp to secure HDFS (Chen He via aw) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/68d1f4bf/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystem.java b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystem.java index e9faaf2..7f93c38 100644 --- a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystem.java +++ b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/snative/SwiftNativeFileSystem.java @@ -222,6 +222,15 @@ public class SwiftNativeFileSystem extends FileSystem { } /** + * Override getCononicalServiceName because we don't support token in Swift + */ + @Override + public String getCanonicalServiceName() { + // Does not support Token + return null; + } + + /** * Return an array containing hostnames, offset and size of * portions of the given file. For a nonexistent * file or regions, null will be returned. http://git-wip-us.apache.org/repos/asf/hadoop/blob/68d1f4bf/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java b/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java index c7e8b57..c84be6b 100644 --- a/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java +++ b/hadoop-tools/hadoop-openstack/src/test/java/org/apache/hadoop/fs/swift/TestSwiftFileSystemBasicOps.java @@ -18,6 +18,7 @@ package org.apache.hadoop.fs.swift; +import org.junit.Assert; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileStatus; @@ -286,4 +287,10 @@ public class TestSwiftFileSystemBasicOps extends SwiftFileSystemBaseTest { } } + @Test(timeout = SWIFT_TEST_TIMEOUT) + public void testGetCanonicalServiceName() { + Assert.assertNull(fs.getCanonicalServiceName()); + } + + }
