big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-14850. Optimize FileSystemAccessService#getFileSystemConfiguration. Contributed by Lisheng Sun.

Browse Source
This commit is contained in:
Inigo Goiri 2019-09-28 17:20:44 -07:00
parent 2200871607
commit d8313b2274
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
View File

@ -136,6 +136,7 @@ public FileSystemAccessService() {
private Collection<String> nameNodeWhitelist; private Collection<String> nameNodeWhitelist;
Configuration serviceHadoopConf; Configuration serviceHadoopConf;
private Configuration fileSystemConf;
private AtomicInteger unmanagedFileSystems = new AtomicInteger(); private AtomicInteger unmanagedFileSystems = new AtomicInteger();
@ -188,6 +189,7 @@ protected void init() throws ServiceException {
} }
try { try {
serviceHadoopConf = loadHadoopConf(hadoopConfDir); serviceHadoopConf = loadHadoopConf(hadoopConfDir);
fileSystemConf = getNewFileSystemConfiguration();
} catch (IOException ex) { } catch (IOException ex) {
throw new ServiceException(FileSystemAccessException.ERROR.H11, ex.toString(), ex); throw new ServiceException(FileSystemAccessException.ERROR.H11, ex.toString(), ex);
} }
@ -212,6 +214,16 @@ private Configuration loadHadoopConf(File dir) throws IOException {
return hadoopConf; return hadoopConf;
} }
private Configuration getNewFileSystemConfiguration() {
Configuration conf = new Configuration(true);
ConfigurationUtils.copy(serviceHadoopConf, conf);
conf.setBoolean(FILE_SYSTEM_SERVICE_CREATED, true);
// Force-clear server-side umask to make HttpFS match WebHDFS behavior
conf.set(FsPermission.UMASK_LABEL, "000");
return conf;
}
@Override @Override
public void postInit() throws ServiceException { public void postInit() throws ServiceException {
super.postInit(); super.postInit();
@ -397,14 +409,7 @@ public void releaseFileSystem(FileSystem fs) throws IOException {
@Override @Override
public Configuration getFileSystemConfiguration() { public Configuration getFileSystemConfiguration() {
Configuration conf = new Configuration(true); return fileSystemConf;
ConfigurationUtils.copy(serviceHadoopConf, conf);
conf.setBoolean(FILE_SYSTEM_SERVICE_CREATED, true);
// Force-clear server-side umask to make HttpFS match WebHDFS behavior
conf.set(FsPermission.UMASK_LABEL, "000");
return conf;
} }
} }