big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the missed file in commit r1499029

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1499041 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brandon Li 2013-07-02 18:03:59 +00:00
parent 37f587563a
commit 70e9e58ff3
6 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/mount/MountdBase.java
View File

@ -50,7 +50,6 @@ public MountdBase(List<String> exports, RpcProgram program) throws IOException {
/* Start UDP server */
private void startUDPServer() {
rpcProgram.register(PortmapMapping.TRANSPORT_UDP);
SimpleUdpServer udpServer = new SimpleUdpServer(rpcProgram.getPort(),
rpcProgram, 1);
udpServer.run();
@ -58,14 +57,17 @@ private void startUDPServer() {
/* Start TCP server */
private void startTCPServer() {
rpcProgram.register(PortmapMapping.TRANSPORT_TCP);
SimpleTcpServer tcpServer = new SimpleTcpServer(rpcProgram.getPort(),
rpcProgram, 1);
tcpServer.run();
}
public void start() {
public void start(boolean register) {
startUDPServer();
startTCPServer();
if (register) {
rpcProgram.register(PortmapMapping.TRANSPORT_UDP);
rpcProgram.register(PortmapMapping.TRANSPORT_TCP);
}
}
}

10
hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3Base.java
View File

@ -52,10 +52,12 @@ protected Nfs3Base(MountdBase mountd, RpcProgram program) {
this.rpcProgram = program;
}
public void start() {
mountd.start(); // Start mountd
rpcProgram.register(PortmapMapping.TRANSPORT_TCP);
startTCPServer(); // Start TCP server
public void start(boolean register) {
mountd.start(register); // Start mountd
startTCPServer(); // Start TCP server
if (register) {
rpcProgram.register(PortmapMapping.TRANSPORT_TCP);
}
}
private void startTCPServer() {

16
hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/Nfs3FileAttributes.java
View File

@ -96,6 +96,22 @@ public Nfs3FileAttributes(boolean isDir, int nlink, short mode, int uid,
this.ctime = this.mtime;
}
public Nfs3FileAttributes(Nfs3FileAttributes other) {
this.type = other.getType();
this.mode = other.getMode();
this.nlink = other.getNlink();
this.uid = other.getUid();
this.gid = other.getGid();
this.size = other.getSize();
this.used = other.getUsed();
this.rdev = new Specdata3();
this.fsid = other.getFsid();
this.fileid = other.getFileid();
this.mtime = new NfsTime(other.getMtime());
this.atime = new NfsTime(other.getAtime());
this.ctime = new NfsTime(other.getCtime());
}
public void serialize(XDR xdr) {
xdr.writeInt(type);
xdr.writeInt(mode);

1
hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java
View File

@ -61,6 +61,7 @@ public static class DirList3 {
public DirList3(Entry3[] entries, boolean eof) {
this.entries = ObjectArrays.newArray(entries, entries.length);
System.arraycopy(this.entries, 0, entries, 0, entries.length);
this.eof = eof;
}
}

1
hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java
View File

@ -65,6 +65,7 @@ public static class DirListPlus3 {
public DirListPlus3(EntryPlus3[] entries, boolean eof) {
this.entries = ObjectArrays.newArray(entries, entries.length);
System.arraycopy(this.entries, 0, entries, 0, entries.length);
this.eof = eof;
}

5
hadoop-project/pom.xml
View File

@ -92,6 +92,11 @@
<artifactId>hadoop-auth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-nfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>