From eb93f73ea85cd017786d848fa7e52a31c7d5b199 Mon Sep 17 00:00:00 2001 From: Brandon Li Date: Wed, 18 Jun 2014 23:51:49 +0000 Subject: [PATCH] HDFS-6553. Add missing DeprecationDeltas for NFS Kerberos configurations. Contributed by Stephen Chu git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603677 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop/hdfs/nfs/conf/NfsConfiguration.java | 14 +++++++++++++- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfiguration.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfiguration.java index 5dc53d83dd..ff927946d1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfiguration.java +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfiguration.java @@ -36,6 +36,8 @@ private static void addDeprecatedKeys() { 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 @@ private static void addDeprecatedKeys() { 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) }); } } \ No newline at end of file diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index bd848218ef..d25e8468c1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -665,6 +665,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)