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

HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li. 

(cherry picked from commit c7d1db7495)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
This commit is contained in:
Haohui Mai 2014-10-29 17:54:26 -07:00 committed by Brandon Li
parent c3de2fc1eb
commit 4e419b6ede
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -304,6 +304,7 @@ Release 2.6.0 - UNRELEASED
HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for
better maintenance (Yongjun Zhang via brandonli)
HADOOP-11247. Fix a couple javac warnings in NFS. (Brandon Li via wheat9)
BUG FIXES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IdMappingConstant.java
View File

@ -32,5 +32,5 @@ public class IdMappingConstant {
// Used for finding the configured static mapping file.
public static final String STATIC_ID_MAPPING_FILE_KEY = "static.id.mapping.file";
public static final String STATIC_ID_MAPPING_FILE_DEFAULT = "/etc/usergroupid.map";
public static final String STATIC_ID_MAPPING_FILE_DEFAULT = "/etc/nfs.map";
}

8
hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
View File

@ -193,12 +193,4 @@ public class Nfs3Constant {
/** Expiration time for nfs exports cache entry */
public static final String NFS_EXPORTS_CACHE_EXPIRYTIME_MILLIS_KEY = "nfs.exports.cache.expirytime.millis";
public static final long NFS_EXPORTS_CACHE_EXPIRYTIME_MILLIS_DEFAULT = 15 * 60 * 1000; // 15 min
@Deprecated
public final static String NFS_USERGROUP_UPDATE_MILLIS_KEY = "nfs.usergroup.update.millis";
// Used for finding the configured static mapping file.
@Deprecated
public static final String NFS_STATIC_MAPPING_FILE_KEY = "nfs.static.mapping.file";
public static final String NFS_STATIC_MAPPING_FILE_DEFAULT = "/etc/nfs.map";
}

4
hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfiguration.java
View File

@ -43,9 +43,9 @@ public class NfsConfiguration extends HdfsConfiguration {
Nfs3Constant.NFS_EXPORTS_CACHE_EXPIRYTIME_MILLIS_KEY),
new DeprecationDelta("hadoop.nfs.userupdate.milly",
IdMappingConstant.USERGROUPID_UPDATE_MILLIS_KEY),
new DeprecationDelta(Nfs3Constant.NFS_USERGROUP_UPDATE_MILLIS_KEY,
new DeprecationDelta("nfs.usergroup.update.millis",
IdMappingConstant.USERGROUPID_UPDATE_MILLIS_KEY),
new DeprecationDelta(Nfs3Constant.NFS_STATIC_MAPPING_FILE_KEY,
new DeprecationDelta("nfs.static.mapping.file",
IdMappingConstant.STATIC_ID_MAPPING_FILE_KEY),
new DeprecationDelta("dfs.nfs3.enableDump",
NfsConfigKeys.DFS_NFS_FILE_DUMP_KEY),

2
hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
View File

@ -174,7 +174,7 @@ public class RpcProgramNfs3 extends RpcProgram implements Nfs3Interface {
this.config = config;
config.set(FsPermission.UMASK_LABEL, "000");
iug = new ShellBasedIdMapping(config,
Nfs3Constant.NFS_STATIC_MAPPING_FILE_DEFAULT);
IdMappingConstant.STATIC_ID_MAPPING_FILE_DEFAULT);
aixCompatMode = config.getBoolean(
NfsConfigKeys.AIX_COMPAT_MODE_KEY,