Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addendum patch for HDFS-6564.

This commit is contained in:
Haohui Mai 2015-06-23 22:30:18 -07:00
parent 77609e6465
commit 0cd7603bd6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
View File

@ -208,7 +208,7 @@ public class WebHdfsFileSystem extends FileSystem
} }
/** Is WebHDFS enabled in conf? */ /** Is WebHDFS enabled in conf? */
public static boolean isEnabled(final Configuration conf, final Log log) { public static boolean isEnabled(final Configuration conf) {
final boolean b = conf.getBoolean( final boolean b = conf.getBoolean(
HdfsClientConfigKeys.DFS_WEBHDFS_ENABLED_KEY, HdfsClientConfigKeys.DFS_WEBHDFS_ENABLED_KEY,
HdfsClientConfigKeys.DFS_WEBHDFS_ENABLED_DEFAULT); HdfsClientConfigKeys.DFS_WEBHDFS_ENABLED_DEFAULT);

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
View File

@ -68,7 +68,7 @@ public class NameNodeHttpServer {
} }
private void initWebHdfs(Configuration conf) throws IOException { private void initWebHdfs(Configuration conf) throws IOException {
if (WebHdfsFileSystem.isEnabled(conf, HttpServer2.LOG)) { if (WebHdfsFileSystem.isEnabled(conf)) {
// set user pattern based on configuration file // set user pattern based on configuration file
UserParam.setUserPattern(conf.get( UserParam.setUserPattern(conf.get(
DFSConfigKeys.DFS_WEBHDFS_USER_PATTERN_KEY, DFSConfigKeys.DFS_WEBHDFS_USER_PATTERN_KEY,