From e5df95f8cbe3f55b9f233398faab85f03507446a Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Thu, 5 Jan 2012 00:16:09 +0000 Subject: [PATCH] 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 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../org/apache/hadoop/yarn/lib/TestZKClient.java | 14 ++++++++------ hadoop-mapreduce-project/hadoop-yarn/pom.xml | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 013dd6378db..3ba7c3c536a 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -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-3478. Cannot build against ZooKeeper 3.4.0. (Tom White via mahadev) + OPTIMIZATIONS MAPREDUCE-3567. Extraneous JobConf objects in AM heap. (Vinod Kumar diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/lib/TestZKClient.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/lib/TestZKClient.java index 586533ec2ae..b857bf309b6 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/lib/TestZKClient.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/lib/TestZKClient.java @@ -29,7 +29,7 @@ import java.net.Socket; import junit.framework.Assert; 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.ZooKeeperServer; import org.apache.zookeeper.server.persistence.FileTxnLog; @@ -45,7 +45,8 @@ public class TestZKClient { protected String hostPort = "127.0.0.1:2000"; protected int maxCnxns = 0; - protected NIOServerCnxn.Factory factory = null; + protected NIOServerCnxnFactory factory = null; + protected ZooKeeperServer zks; protected File tmpDir = null; public static String send4LetterWord(String host, int port, String cmd) @@ -144,10 +145,11 @@ public class TestZKClient { BASETEST.mkdirs(); } 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]); if (factory == null) { - factory = new NIOServerCnxn.Factory(new InetSocketAddress(PORT),maxCnxns); + factory = new NIOServerCnxnFactory(); + factory.configure(new InetSocketAddress(PORT), maxCnxns); } factory.startup(zks); Assert.assertTrue("waiting for server up", @@ -158,8 +160,8 @@ public class TestZKClient { @After public void tearDown() throws IOException, InterruptedException { - if (factory != null) { - ZKDatabase zkDb = factory.getZooKeeperServer().getZKDatabase(); + if (zks != null) { + ZKDatabase zkDb = zks.getZKDatabase(); factory.shutdown(); try { zkDb.close(); diff --git a/hadoop-mapreduce-project/hadoop-yarn/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/pom.xml index ca3fc69eb07..f7ac545fab7 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/pom.xml @@ -378,7 +378,7 @@ org.apache.zookeeper zookeeper - 3.3.1 + 3.4.2