Author: brandonli
Date: Wed Sep 25 22:16:34 2013
New Revision: 1526319
URL: http://svn.apache.org/r1526319
Log:
HDFS-5246. Merging change r1526316 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Base.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1526319&r1=1526318&r2=1526319&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Wed Sep 25 22:16:34 2013
@@ -1219,4 +1219,19 @@
</description>
</property>
+<property>
+ <name>nfs3.server.port</name>
+ <value>2049</value>
+ <description>
+ Specify the port number used by Hadoop NFS.
+ </description>
+</property>
+
+<property>
+ <name>nfs3.mountd.port</name>
+ <value>4242</value>
+ <description>
+ Specify the port number used by Hadoop mount daemon.
+ </description>
+</property>
</configuration>
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml?rev=1526319&r1=1526318&r2=1526319&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml
Wed Sep 25 22:16:34 2013
@@ -69,4 +69,13 @@
<value>simple</value>
</property>
+<property>
+ <name>nfs3.server.port</name>
+ <value>2079</value>
+</property>
+
+<property>
+ <name>nfs3.mountd.port</name>
+ <value>4272</value>
+</property>
</configuration>
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Base.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Base.java?rev=1526319&r1=1526318&r2=1526319&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Base.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Base.java
Wed Sep 25 22:16:34 2013
@@ -19,6 +19,7 @@ package org.apache.hadoop.nfs.nfs3;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mount.MountdBase;
import org.apache.hadoop.oncrpc.RpcProgram;
import org.apache.hadoop.oncrpc.RpcUtil;
@@ -38,6 +39,7 @@ public abstract class Nfs3Base {
public static final Log LOG = LogFactory.getLog(Nfs3Base.class);
private final MountdBase mountd;
private final RpcProgram rpcProgram;
+ private final int nfsPort;
public MountdBase getMountBase() {
return mountd;
@@ -47,9 +49,17 @@ public abstract class Nfs3Base {
return rpcProgram;
}
+ protected Nfs3Base(MountdBase mountd, RpcProgram program, Configuration
conf) {
+ this.mountd = mountd;
+ this.rpcProgram = program;
+ this.nfsPort = conf.getInt("nfs3.server.port", Nfs3Constant.PORT);
+ LOG.info("NFS server port set to: "+nfsPort);
+ }
+
protected Nfs3Base(MountdBase mountd, RpcProgram program) {
this.mountd = mountd;
this.rpcProgram = program;
+ this.nfsPort = Nfs3Constant.PORT;
}
public void start(boolean register) {
@@ -61,7 +71,7 @@ public abstract class Nfs3Base {
}
private void startTCPServer() {
- SimpleTcpServer tcpServer = new SimpleTcpServer(Nfs3Constant.PORT,
+ SimpleTcpServer tcpServer = new SimpleTcpServer(nfsPort,
rpcProgram, 0) {
@Override
public ChannelPipelineFactory getPipelineFactory() {
