From f1b32d1436ba62e8bcea39bb33056d431a37673b Mon Sep 17 00:00:00 2001 From: Gera Shegalov Date: Tue, 10 Mar 2015 13:52:06 -0700 Subject: [PATCH] DelegateToFileSystem erroneously uses default FS's port in constructor. (Brahma Reddy Battula via gera) (cherry picked from commit 64eb068ee8863da41df8db44bde1a9033198983d) --- .../hadoop-common/CHANGES.txt | 3 ++ .../hadoop/fs/DelegateToFileSystem.java | 3 +- .../src/main/resources/core-default.xml | 6 +++ .../hadoop/fs/TestDelegateToFileSystem.java | 52 +++++++++++++++++++ 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDelegateToFileSystem.java diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index cfbe92f4886..16665f502b1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -668,6 +668,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11692. Improve authentication failure WARN message to avoid user confusion. (Yongjun Zhang) + HADOOP-11618. DelegateToFileSystem erroneously uses default FS's port in + constructor. (Brahma Reddy Battula via gera) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java index 09707c6c079..6b7f387b0fb 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java @@ -29,7 +29,6 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Options.ChecksumOpt; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.Progressable; @@ -47,7 +46,7 @@ public abstract class DelegateToFileSystem extends AbstractFileSystem { Configuration conf, String supportedScheme, boolean authorityRequired) throws IOException, URISyntaxException { super(theUri, supportedScheme, authorityRequired, - FileSystem.getDefaultUri(conf).getPort()); + theFsImpl.getDefaultPort()); fsImpl = theFsImpl; fsImpl.initialize(theUri, conf); fsImpl.statistics = getStatistics(); diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index 76b3e2fe111..fedbc22b944 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -572,6 +572,12 @@ for ldap providers in the same way as above does. (ie client side mount table:). + + fs.AbstractFileSystem.ftp.impl + org.apache.hadoop.fs.ftp.FtpFs + The FileSystem for Ftp: uris. + + fs.ftp.host 0.0.0.0 diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDelegateToFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDelegateToFileSystem.java new file mode 100644 index 00000000000..5de32861db6 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDelegateToFileSystem.java @@ -0,0 +1,52 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.fs; + +import java.net.URI; + +import org.apache.commons.net.ftp.FTP; +import org.apache.hadoop.conf.Configuration; +import org.junit.Assert; +import org.junit.Test; + +public class TestDelegateToFileSystem { + + private static final String FTP_DUMMYHOST = "ftp://dummyhost"; + private static final URI FTP_URI_NO_PORT = URI.create(FTP_DUMMYHOST); + private static final URI FTP_URI_WITH_PORT = URI.create(FTP_DUMMYHOST + ":" + + FTP.DEFAULT_PORT); + + private void testDefaultUriInternal(String defaultUri) + throws UnsupportedFileSystemException { + final Configuration conf = new Configuration(); + FileSystem.setDefaultUri(conf, defaultUri); + final AbstractFileSystem ftpFs = + AbstractFileSystem.get(FTP_URI_NO_PORT, conf); + Assert.assertEquals(FTP_URI_WITH_PORT, ftpFs.getUri()); + } + + @Test + public void testDefaultURIwithOutPort() throws Exception { + testDefaultUriInternal("hdfs://dummyhost"); + } + + @Test + public void testDefaultURIwithPort() throws Exception { + testDefaultUriInternal("hdfs://dummyhost:8020"); + } +}