Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java Mon Apr 28 19:40:06 2014 @@ -20,7 +20,7 @@ package org.apache.hadoop.util; import java.io.File; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.log4j.Logger; import org.junit.Test;
Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIdentityHashStore.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIdentityHashStore.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIdentityHashStore.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIdentityHashStore.java Mon Apr 28 19:40:06 2014 @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java Mon Apr 28 19:40:06 2014 @@ -24,7 +24,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.util.LineReader; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; public class TestLineReader { private LineReader lineReader; Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-minikdc/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-minikdc/pom.xml?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-minikdc/pom.xml (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-minikdc/pom.xml Mon Apr 28 19:40:06 2014 @@ -150,12 +150,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/pom.xml?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/pom.xml (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/pom.xml Mon Apr 28 19:40:06 2014 @@ -51,7 +51,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.2</version> </dependency> <dependency> <groupId>org.mockito</groupId> Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java Mon Apr 28 19:40:06 2014 @@ -18,6 +18,7 @@ package org.apache.hadoop.oncrpc; import java.io.IOException; +import java.net.DatagramSocket; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,6 +47,12 @@ public abstract class RpcProgram extends private final int highProgVersion; /** + * If not null, this will be used as the socket to use to connect to the + * system portmap daemon when registering this RPC server program. + */ + private final DatagramSocket registrationSocket; + + /** * Constructor * * @param program program name @@ -56,13 +63,15 @@ public abstract class RpcProgram extends * @param highProgVersion highest version of the specification supported */ protected RpcProgram(String program, String host, int port, int progNumber, - int lowProgVersion, int highProgVersion) { + int lowProgVersion, int highProgVersion, + DatagramSocket registrationSocket) { this.program = program; this.host = host; this.port = port; this.progNumber = progNumber; this.lowProgVersion = lowProgVersion; this.highProgVersion = highProgVersion; + this.registrationSocket = registrationSocket; } /** @@ -105,14 +114,14 @@ public abstract class RpcProgram extends protected void register(PortmapMapping mapEntry, boolean set) { XDR mappingRequest = PortmapRequest.create(mapEntry, set); SimpleUdpClient registrationClient = new SimpleUdpClient(host, RPCB_PORT, - mappingRequest); + mappingRequest, registrationSocket); try { registrationClient.run(); } catch (IOException e) { String request = set ? "Registration" : "Unregistration"; LOG.error(request + " failure with " + host + ":" + port - + ", portmap entry: " + mapEntry); - throw new RuntimeException(request + " failure"); + + ", portmap entry: " + mapEntry, e); + throw new RuntimeException(request + " failure", e); } } Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java Mon Apr 28 19:40:06 2014 @@ -27,43 +27,56 @@ import java.util.Arrays; * A simple UDP based RPC client which just sends one request to a server. */ public class SimpleUdpClient { + protected final String host; protected final int port; protected final XDR request; protected final boolean oneShot; + protected final DatagramSocket clientSocket; - public SimpleUdpClient(String host, int port, XDR request) { - this(host, port, request, true); + public SimpleUdpClient(String host, int port, XDR request, + DatagramSocket clientSocket) { + this(host, port, request, true, clientSocket); } - public SimpleUdpClient(String host, int port, XDR request, Boolean oneShot) { + public SimpleUdpClient(String host, int port, XDR request, Boolean oneShot, + DatagramSocket clientSocket) { this.host = host; this.port = port; this.request = request; this.oneShot = oneShot; + this.clientSocket = clientSocket; } public void run() throws IOException { - DatagramSocket clientSocket = new DatagramSocket(); InetAddress IPAddress = InetAddress.getByName(host); byte[] sendData = request.getBytes(); byte[] receiveData = new byte[65535]; - - DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, - IPAddress, port); - clientSocket.send(sendPacket); - DatagramPacket receivePacket = new DatagramPacket(receiveData, - receiveData.length); - clientSocket.receive(receivePacket); - - // Check reply status - XDR xdr = new XDR(Arrays.copyOfRange(receiveData, 0, - receivePacket.getLength())); - RpcReply reply = RpcReply.read(xdr); - if (reply.getState() != RpcReply.ReplyState.MSG_ACCEPTED) { - throw new IOException("Request failed: " + reply.getState()); + // Use the provided socket if there is one, else just make a new one. + DatagramSocket socket = this.clientSocket == null ? + new DatagramSocket() : this.clientSocket; + + try { + DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, + IPAddress, port); + socket.send(sendPacket); + DatagramPacket receivePacket = new DatagramPacket(receiveData, + receiveData.length); + socket.receive(receivePacket); + + // Check reply status + XDR xdr = new XDR(Arrays.copyOfRange(receiveData, 0, + receivePacket.getLength())); + RpcReply reply = RpcReply.read(xdr); + if (reply.getState() != RpcReply.ReplyState.MSG_ACCEPTED) { + throw new IOException("Request failed: " + reply.getState()); + } + } finally { + // If the client socket was passed in to this UDP client, it's on the + // caller of this UDP client to close that socket. + if (this.clientSocket == null) { + socket.close(); + } } - - clientSocket.close(); } } Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java Mon Apr 28 19:40:06 2014 @@ -17,7 +17,7 @@ */ package org.apache.hadoop.nfs; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.nfs.AccessPrivilege; import org.apache.hadoop.nfs.NfsExports; Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsTime.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsTime.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsTime.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsTime.java Mon Apr 28 19:40:06 2014 @@ -17,7 +17,7 @@ */ package org.apache.hadoop.nfs; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.nfs.NfsTime; import org.apache.hadoop.oncrpc.XDR; Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestFileHandle.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestFileHandle.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestFileHandle.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestFileHandle.java Mon Apr 28 19:40:06 2014 @@ -17,7 +17,7 @@ */ package org.apache.hadoop.nfs.nfs3; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.nfs.nfs3.FileHandle; import org.apache.hadoop.oncrpc.XDR; Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java Mon Apr 28 19:40:06 2014 @@ -51,7 +51,8 @@ public class TestFrameDecoder { protected TestRpcProgram(String program, String host, int port, int progNumber, int lowProgVersion, int highProgVersion) { - super(program, host, port, progNumber, lowProgVersion, highProgVersion); + super(program, host, port, progNumber, lowProgVersion, highProgVersion, + null); } @Override Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java?rev=1590766&r1=1590765&r2=1590766&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java (original) +++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java Mon Apr 28 19:40:06 2014 @@ -25,7 +25,7 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.oncrpc.RpcCall; import org.apache.hadoop.oncrpc.XDR;
