You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by br...@apache.org on 2014/03/05 19:55:51 UTC

svn commit: r1574621 - in /hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/bin/hdfs

Author: brandonli
Date: Wed Mar  5 18:55:50 2014
New Revision: 1574621

URL: http://svn.apache.org/r1574621
Log:
HDFS-6043. Merging change 1574620 from branch-2

Modified:
    hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs

Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1574621&r1=1574620&r2=1574621&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Mar  5 18:55:50 2014
@@ -119,6 +119,8 @@ Release 2.4.0 - UNRELEASED
     HDFS-5167. Add metrics about the NameNode retry cache. (Tsuyoshi OZAWA via
     jing9)
 
+    HDFS-6043. Give HDFS daemons NFS3 and Portmap their own OPTS (brandonli)
+
   OPTIMIZATIONS
 
     HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery

Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs?rev=1574621&r1=1574620&r2=1574621&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs (original)
+++ hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs Wed Mar  5 18:55:50 2014
@@ -154,8 +154,10 @@ elif [ "$COMMAND" = "lsSnapshottableDir"
   CLASS=org.apache.hadoop.hdfs.tools.snapshot.LsSnapshottableDir
 elif [ "$COMMAND" = "portmap" ] ; then
   CLASS=org.apache.hadoop.portmap.Portmap
+  HADOOP_OPTS="$HADOOP_OPTS $HADOOP_PORTMAP_OPTS"
 elif [ "$COMMAND" = "nfs3" ] ; then
   CLASS=org.apache.hadoop.hdfs.nfs.nfs3.Nfs3
+  HADOOP_OPTS="$HADOOP_OPTS $HADOOP_NFS3_OPTS"
 elif [ "$COMMAND" = "cacheadmin" ] ; then
   CLASS=org.apache.hadoop.hdfs.tools.CacheAdmin
 else