hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject git commit: HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li.
Date Thu, 30 Oct 2014 00:57:04 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 6f5f604a7 -> 05b66ca07


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05b66ca0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05b66ca0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05b66ca0

Branch: refs/heads/trunk
Commit: 05b66ca0749bdb03d1df3b95199eb4f331409f7d
Parents: 6f5f604
Author: Haohui Mai <wheat9@apache.org>
Authored: Wed Oct 29 17:54:26 2014 -0700
Committer: Haohui Mai <wheat9@apache.org>
Committed: Wed Oct 29 17:54:26 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt              | 2 ++
 .../java/org/apache/hadoop/security/IdMappingConstant.java   | 2 +-
 .../main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java   | 8 --------
 .../org/apache/hadoop/hdfs/nfs/conf/NfsConfiguration.java    | 4 ++--
 .../java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05b66ca0/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index ce865e1..8350c95 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -378,6 +378,8 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11186. documentation should talk about
     hadoop.htrace.spanreceiver.classes, not hadoop.trace.spanreceiver.classes (cmccabe)
 
+    HADOOP-11247. Fix a couple javac warnings in NFS. (Brandon Li via wheat9)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05b66ca0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IdMappingConstant.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IdMappingConstant.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IdMappingConstant.java
index f43556f..29664fb 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IdMappingConstant.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/IdMappingConstant.java
@@ -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";
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05b66ca0/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
index 8b269af..6ab6f6f 100644
--- a/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
+++ b/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Constant.java
@@ -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";
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05b66ca0/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/conf/NfsConfiguration.java
----------------------------------------------------------------------
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 5e73afb..23f9148 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
@@ -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),

http://git-wip-us.apache.org/repos/asf/hadoop/blob/05b66ca0/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
index fb21565..91d066e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
@@ -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,


Mime
View raw message