This is an automated email from the ASF dual-hosted git repository.
liuml07 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 263c76b HADOOP-17011. Tolerate leading and trailing spaces in
fs.defaultFS. Contributed by Ctest
263c76b is described below
commit 263c76b678275dfff867415c71ba9dc00a9235ef
Author: Mingliang Liu <lium...@apache.org>
AuthorDate: Thu Apr 30 14:13:21 2020 -0700
HADOOP-17011. Tolerate leading and trailing spaces in fs.defaultFS.
Contributed by Ctest
Signed-off-by: Ayush Saxena <ayushsax...@apache.org>
---
.../src/main/java/org/apache/hadoop/fs/FileContext.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/FileSystem.java | 3 ++-
.../src/main/java/org/apache/hadoop/fs/shell/FsCommand.java | 2 +-
.../org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java | 2 +-
.../hadoop/lib/service/hadoop/FileSystemAccessService.java | 9 ++++++---
.../org/apache/hadoop/hdfs/server/namenode/NameNodeUtils.java | 2 +-
.../apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java | 3 ++-
.../org/apache/hadoop/mapred/uploader/FrameworkUploader.java | 2 +-
.../java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java | 2 +-
9 files changed, 16 insertions(+), 11 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
index df93e89..ba0064f 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
@@ -483,7 +483,7 @@ public class FileContext implements PathCapabilities {
*/
public static FileContext getFileContext(final Configuration aConf)
throws UnsupportedFileSystemException {
- final URI defaultFsUri = URI.create(aConf.get(FS_DEFAULT_NAME_KEY,
+ final URI defaultFsUri = URI.create(aConf.getTrimmed(FS_DEFAULT_NAME_KEY,
FS_DEFAULT_NAME_DEFAULT));
if ( defaultFsUri.getScheme() != null
&& !defaultFsUri.getScheme().trim().isEmpty()) {
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 358db74..abb31ed 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -278,7 +278,8 @@ public abstract class FileSystem extends Configured
* @return the uri of the default filesystem
*/
public static URI getDefaultUri(Configuration conf) {
- URI uri = URI.create(fixName(conf.get(FS_DEFAULT_NAME_KEY, DEFAULT_FS)));
+ URI uri =
+ URI.create(fixName(conf.getTrimmed(FS_DEFAULT_NAME_KEY, DEFAULT_FS)));
if (uri.getScheme() == null) {
throw new IllegalArgumentException("No scheme in default FS: " + uri);
}
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
index 784bbf3..ea8378d 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
@@ -108,7 +108,7 @@ abstract public class FsCommand extends Command {
HADOOP_SHELL_MISSING_DEFAULT_FS_WARNING_KEY,
HADOOP_SHELL_MISSING_DEFAULT_FS_WARNING_DEFAULT);
if (displayWarnings) {
- final String defaultFs = getConf().get(FS_DEFAULT_NAME_KEY);
+ final String defaultFs = getConf().getTrimmed(FS_DEFAULT_NAME_KEY);
final boolean missingDefaultFs =
defaultFs == null || defaultFs.equals(FS_DEFAULT_NAME_DEFAULT);
if (missingDefaultFs) {
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
index 66438b5..ef2a246 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
@@ -101,7 +101,7 @@ public class HttpFSServerWebApp extends ServerWebApp {
adminGroup = getConfig().get(getPrefixedName(CONF_ADMIN_GROUP), "admin");
LOG.info("Connects to Namenode [{}]",
get().get(FileSystemAccess.class).getFileSystemConfiguration().
- get(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY));
+ getTrimmed(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY));
}
/**
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
index b2bba08..094526a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
@@ -341,8 +341,9 @@ public class FileSystemAccessService extends BaseService
implements FileSystemAc
}
try {
validateNamenode(
- new URI(conf.get(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY)).
- getAuthority());
+ new URI(conf.getTrimmed(
+ CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY)).
+ getAuthority());
UserGroupInformation ugi = getUGI(user);
return ugi.doAs(new PrivilegedExceptionAction<T>() {
@Override
@@ -377,7 +378,9 @@ public class FileSystemAccessService extends BaseService
implements FileSystemAc
}
try {
validateNamenode(
- new
URI(conf.get(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY)).getAuthority());
+ new URI(conf.getTrimmed(
+ CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY)).
+ getAuthority());
UserGroupInformation ugi = getUGI(user);
return ugi.doAs(new PrivilegedExceptionAction<FileSystem>() {
@Override
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeUtils.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeUtils.java
index ec1d510..837b1a9 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeUtils.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeUtils.java
@@ -70,7 +70,7 @@ public final class NameNodeUtils {
final Collection<String> nameservices =
DFSUtilClient.getNameServiceIds(conf);
- final String nnAddr = conf.get(FS_DEFAULT_NAME_KEY);
+ final String nnAddr = conf.getTrimmed(FS_DEFAULT_NAME_KEY);
if (nnAddr == null) {
// default fs is not set.
return null;
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
index 5160ce8..e22726c 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
@@ -302,7 +302,8 @@ public class JobHistoryUtils {
FileContext fc = getDefaultFileContext();
if (fc == null ||
fc.getDefaultFileSystem().getUri().toString().equals(
- conf.get(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY, "")) ||
+ conf.getTrimmed(
+ CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY, "")) ||
path.toUri().getAuthority() != null ||
path.toUri().getScheme()!= null) {
return sourcePath;
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
index 52ee38a..f3f0f0c 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
@@ -566,7 +566,7 @@ public class FrameworkUploader implements Runnable {
path.startsWith("file://");
if (fs == null) {
- fs = conf.get(FS_DEFAULT_NAME_KEY);
+ fs = conf.getTrimmed(FS_DEFAULT_NAME_KEY);
if (fs == null && !isFullPath) {
LOG.error("No filesystem specified in either fs or target.");
printHelp(opts);
diff --git
a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
index 4aa9d71..16e4c3a 100644
---
a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
+++
b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
@@ -86,7 +86,7 @@ class ClusterSummarizer implements StatListener<ClusterStats>
{
void start(Configuration conf) {
jobTrackerInfo = conf.get(JTConfig.JT_IPC_ADDRESS);
- namenodeInfo = conf.get(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY);
+ namenodeInfo =
conf.getTrimmed(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY);
}
// Getters
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
