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

HDFS-6553. Merging change r1603677 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603679 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brandon Li 2014-06-18 23:55:13 +00:00
parent 1bbdc43f92
commit a817378930
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,8 @@ public class NfsConfiguration extends HdfsConfiguration {
NfsConfigKeys.DFS_NFS_SERVER_PORT_KEY),
new DeprecationDelta("nfs3.mountd.port",
NfsConfigKeys.DFS_NFS_MOUNTD_PORT_KEY),
new DeprecationDelta("dfs.nfs.exports.cache.size",
Nfs3Constant.NFS_EXPORTS_CACHE_SIZE_KEY),
new DeprecationDelta("dfs.nfs.exports.cache.expirytime.millis",
Nfs3Constant.NFS_EXPORTS_CACHE_EXPIRYTIME_MILLIS_KEY),
new DeprecationDelta("hadoop.nfs.userupdate.milly",
@ -51,6 +53,16 @@ public class NfsConfiguration extends HdfsConfiguration {
new DeprecationDelta("dfs.nfs3.export.point",
NfsConfigKeys.DFS_NFS_EXPORT_POINT_KEY),
new DeprecationDelta("nfs.allow.insecure.ports",
NfsConfigKeys.DFS_NFS_PORT_MONITORING_DISABLED_KEY) });
NfsConfigKeys.DFS_NFS_PORT_MONITORING_DISABLED_KEY),
new DeprecationDelta("dfs.nfs.keytab.file",
NfsConfigKeys.DFS_NFS_KEYTAB_FILE_KEY),
new DeprecationDelta("dfs.nfs.kerberos.principal",
NfsConfigKeys.DFS_NFS_KERBEROS_PRINCIPAL_KEY),
new DeprecationDelta("dfs.nfs.rtmax",
NfsConfigKeys.DFS_NFS_MAX_READ_TRANSFER_SIZE_KEY),
new DeprecationDelta("dfs.nfs.wtmax",
NfsConfigKeys.DFS_NFS_MAX_WRITE_TRANSFER_SIZE_KEY),
new DeprecationDelta("dfs.nfs.dtmax",
NfsConfigKeys.DFS_NFS_MAX_READDIR_TRANSFER_SIZE_KEY) });
}
}

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -410,6 +410,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6559. Fix wrong option "dfsadmin -rollingUpgrade start" in the
document. (Akira Ajisaka via Arpit Agarwal)
HDFS-6553. Add missing DeprecationDeltas for NFS Kerberos configurations
(Stephen Chu via brandonli)
BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS
HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh)