Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-3478. Cannot build against ZooKeeper 3.4.0. (Tom White via mahadev) - Merging r1227408 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227409 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mahadev Konar 2012-01-05 00:16:09 +00:00
parent d296bc2a88
commit e5df95f8cb
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -92,6 +92,8 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3610. Remove use of the 'dfs.block.size' config for default block size fetching. Use FS#getDefaultBlocksize instead. (Sho Shimauchi via harsh) MAPREDUCE-3610. Remove use of the 'dfs.block.size' config for default block size fetching. Use FS#getDefaultBlocksize instead. (Sho Shimauchi via harsh)
MAPREDUCE-3478. Cannot build against ZooKeeper 3.4.0. (Tom White via mahadev)
OPTIMIZATIONS OPTIMIZATIONS
MAPREDUCE-3567. Extraneous JobConf objects in AM heap. (Vinod Kumar MAPREDUCE-3567. Extraneous JobConf objects in AM heap. (Vinod Kumar

14
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/lib/TestZKClient.java
View File

@ -29,7 +29,7 @@ import java.net.Socket;
import junit.framework.Assert; import junit.framework.Assert;
import org.apache.hadoop.yarn.lib.ZKClient; import org.apache.hadoop.yarn.lib.ZKClient;
import org.apache.zookeeper.server.NIOServerCnxn; import org.apache.zookeeper.server.NIOServerCnxnFactory;
import org.apache.zookeeper.server.ZKDatabase; import org.apache.zookeeper.server.ZKDatabase;
import org.apache.zookeeper.server.ZooKeeperServer; import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.persistence.FileTxnLog; import org.apache.zookeeper.server.persistence.FileTxnLog;
@ -45,7 +45,8 @@ public class TestZKClient {
protected String hostPort = "127.0.0.1:2000"; protected String hostPort = "127.0.0.1:2000";
protected int maxCnxns = 0; protected int maxCnxns = 0;
protected NIOServerCnxn.Factory factory = null; protected NIOServerCnxnFactory factory = null;
protected ZooKeeperServer zks;
protected File tmpDir = null; protected File tmpDir = null;
public static String send4LetterWord(String host, int port, String cmd) public static String send4LetterWord(String host, int port, String cmd)
@ -144,10 +145,11 @@ public class TestZKClient {
BASETEST.mkdirs(); BASETEST.mkdirs();
} }
File dataDir = createTmpDir(BASETEST); File dataDir = createTmpDir(BASETEST);
ZooKeeperServer zks = new ZooKeeperServer(dataDir, dataDir, 3000); zks = new ZooKeeperServer(dataDir, dataDir, 3000);
final int PORT = Integer.parseInt(hostPort.split(":")[1]); final int PORT = Integer.parseInt(hostPort.split(":")[1]);
if (factory == null) { if (factory == null) {
factory = new NIOServerCnxn.Factory(new InetSocketAddress(PORT),maxCnxns); factory = new NIOServerCnxnFactory();
factory.configure(new InetSocketAddress(PORT), maxCnxns);
} }
factory.startup(zks); factory.startup(zks);
Assert.assertTrue("waiting for server up", Assert.assertTrue("waiting for server up",
@ -158,8 +160,8 @@ public class TestZKClient {
@After @After
public void tearDown() throws IOException, InterruptedException { public void tearDown() throws IOException, InterruptedException {
if (factory != null) { if (zks != null) {
ZKDatabase zkDb = factory.getZooKeeperServer().getZKDatabase(); ZKDatabase zkDb = zks.getZKDatabase();
factory.shutdown(); factory.shutdown();
try { try {
zkDb.close(); zkDb.close();

2
hadoop-mapreduce-project/hadoop-yarn/pom.xml
View File

@ -378,7 +378,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.3.1</version> <version>3.4.2</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<!-- otherwise seems to drag in junit 3.8.1 via jline --> <!-- otherwise seems to drag in junit 3.8.1 via jline -->