commit 8d89cc62f7bce568af2d198394bfccabe77447ef Author: Todd Lipcon Date: Tue Aug 16 21:09:36 2011 -0700 pom hack for trunk diff --git pom.xml pom.xml index a94ef20..853c4a9 100644 --- pom.xml +++ pom.xml @@ -633,11 +633,6 @@ 1.1.1 2.1 r09 - - 0.20-append-r1057313 5.5.23 2.1 6.1.26 @@ -739,33 +734,6 @@ - org.apache.hadoop - hadoop-core - ${hadoop.version} - - - hsqldb - hsqldb - - - net.sf.kosmosfs - kfs - - - org.eclipse.jdt - core - - - net.java.dev.jets3t - jets3t - - - oro - oro - - - - org.apache.zookeeper zookeeper ${zookeeper.version} @@ -947,12 +915,6 @@ ${commons-math.version} test - - org.apache.hadoop - hadoop-test - ${hadoop.version} - test - + + hadoop-0.20 + + + !hadoop23 + + + + + 0.20-append-r1057313 + + + + org.apache.hadoop + hadoop-core + ${hadoop.version} + + + hsqldb + hsqldb + + + net.sf.kosmosfs + kfs + + + org.eclipse.jdt + core + + + net.java.dev.jets3t + jets3t + + + oro + oro + + + + + + org.apache.hadoop + hadoop-test + ${hadoop.version} + test + + + + + + + hadoop-0.23 + + + hadoop23 + + + + 0.23.0-SNAPSHOT + + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + + hsqldb + hsqldb + + + net.sf.kosmosfs + kfs + + + org.eclipse.jdt + core + + + net.java.dev.jets3t + jets3t + + + oro + oro + + + jdiff + jdiff + + + org.apache.lucene + lucene-core + + + + + + org.apache.hadoop + hadoop-annotations + ${hadoop.version} + provided + + + org.apache.hadoop + hadoop-hdfs + ${hadoop.version} + + + + hsqldb + hsqldb + + + net.sf.kosmosfs + kfs + + + org.eclipse.jdt + core + + + net.java.dev.jets3t + jets3t + + + oro + oro + + + jdiff + jdiff + + + org.apache.lucene + lucene-core + + + + + org.apache.hadoop + hadoop-mapred + ${hadoop.version} + + + + hsqldb + hsqldb + + + net.sf.kosmosfs + kfs + + + org.eclipse.jdt + core + + + net.java.dev.jets3t + jets3t + + + oro + oro + + + jdiff + jdiff + + + org.apache.lucene + lucene-core + + + + + + org.apache.hadoop + hadoop-common-test + ${hadoop.version} + test + + + org.apache.hadoop + hadoop-hdfs-test + ${hadoop.version} + test + + + org.apache.hadoop + hadoop-mapred-test + ${hadoop.version} + test + + + diff --git src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java index aa09b7d..cd32af4 100644 --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -195,7 +195,7 @@ public class HConnectionManager { * @param stopProxy * Shuts down all the proxy's put up to cluster members including to * cluster HMaster. Calls - * {@link HBaseRPC#stopProxy(org.apache.hadoop.ipc.VersionedProtocol)} + * {@link HBaseRPC#stopProxy(org.apache.hadoop.hbase.ipc.VersionedProtocol)} * . */ public static void deleteConnection(Configuration conf, boolean stopProxy) { diff --git src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEndpointCoprocessor.java src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEndpointCoprocessor.java index 9768476..6f88357 100644 --- src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEndpointCoprocessor.java +++ src/main/java/org/apache/hadoop/hbase/coprocessor/BaseEndpointCoprocessor.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.ipc.CoprocessorProtocol; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; /** * This abstract class provides default implementation of an Endpoint. diff --git src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorProtocol.java src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorProtocol.java index 149193b..6fcb771 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorProtocol.java +++ src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorProtocol.java @@ -19,7 +19,7 @@ */ package org.apache.hadoop.hbase.ipc; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; /** * All custom RPC protocols to be exported by Coprocessors must extend this interface. diff --git src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java index 776613d..6e95387 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java +++ src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java @@ -57,7 +57,7 @@ import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.ipc.RemoteException; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ReflectionUtils; diff --git src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java index da717b2..b8a2f55 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java +++ src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java @@ -27,7 +27,7 @@ import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.RetriesExhaustedException; import org.apache.hadoop.io.Writable; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ReflectionUtils; diff --git src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java index 882cbc4..1c68875 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java +++ src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java @@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.ipc; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.hadoop.metrics.MetricsContext; import org.apache.hadoop.metrics.MetricsRecord; import org.apache.hadoop.metrics.MetricsUtil; diff --git src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java index 7117bce..913f70d 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java +++ src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java @@ -63,7 +63,7 @@ import org.apache.hadoop.hbase.util.ByteBufferOutputStream; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.StringUtils; diff --git src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java index c0aa024..a152092 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java +++ src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java @@ -26,7 +26,7 @@ import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.UnknownRegionException; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; /** * Clients interact with the HMasterInterface to gain access to meta-level diff --git src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java index e48222b..742290c 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java +++ src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.hadoop.hbase.HServerLoad; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.io.MapWritable; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; /** * The Master publishes this Interface for RegionServers to register themselves diff --git src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java index c3732c8..bf7f1be 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java +++ src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java @@ -45,7 +45,7 @@ import org.apache.hadoop.hbase.filter.WritableByteArrayComparable; import org.apache.hadoop.hbase.regionserver.RegionOpeningState; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.ipc.RemoteException; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; /** * Clients interact with HRegionServers using a handle to the HRegionInterface. diff --git src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java index 71357d4..1b5629a 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java +++ src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.net.InetSocketAddress; import javax.net.SocketFactory; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.conf.Configuration; diff --git src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index aa04fd5..07aec23 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.ipc; import com.google.common.base.Function; import org.apache.hadoop.io.Writable; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import java.io.IOException; import java.net.InetSocketAddress; diff --git src/main/java/org/apache/hadoop/hbase/ipc/VersionedProtocol.java src/main/java/org/apache/hadoop/hbase/ipc/VersionedProtocol.java new file mode 100644 index 0000000..6d52b89 --- /dev/null +++ src/main/java/org/apache/hadoop/hbase/ipc/VersionedProtocol.java @@ -0,0 +1,40 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hbase.ipc; + +import java.io.IOException; + +/** + * Superclass of all protocols that use Hadoop RPC. + * Subclasses of this interface are also supposed to have + * a static final long versionID field. + */ +public interface VersionedProtocol { + + /** + * Return protocol version corresponding to protocol interface. + * @param protocol The classname of the protocol interface + * @param clientVersion The version of the protocol that the client speaks + * @return the version that the server will speak + * @throws IOException if any IO error occurs + */ + @Deprecated + public long getProtocolVersion(String protocol, + long clientVersion) throws IOException; +} diff --git src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java index dc85043..fe8a677 100644 --- src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java +++ src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java @@ -38,7 +38,7 @@ import org.apache.commons.logging.*; import org.apache.hadoop.hbase.io.HbaseObjectWritable; import org.apache.hadoop.hbase.util.Objects; import org.apache.hadoop.io.*; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authorize.ServiceAuthorizationManager; import org.apache.hadoop.conf.*; diff --git src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index f2bdd73..3c98c00 100644 --- src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -69,6 +69,7 @@ import org.apache.hadoop.hdfs.DFSClient; import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; +import org.apache.hadoop.hdfs.server.namenode.LeaseManager; import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.mapred.MiniMRCluster; import org.apache.zookeeper.ZooKeeper; @@ -1443,7 +1444,11 @@ public class HBaseTestingUtility { field = nn.getClass().getDeclaredField("namesystem"); field.setAccessible(true); FSNamesystem namesystem = (FSNamesystem)field.get(nn); - namesystem.leaseManager.setLeasePeriod(100, 50000); + + field = namesystem.getClass().getDeclaredField("leaseManager"); + field.setAccessible(true); + LeaseManager lm = (LeaseManager)field.get(namesystem); + lm.setLeasePeriod(100, 50000); } /** diff --git src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java index 0b21c6c..888f428 100644 --- src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java +++ src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java @@ -31,7 +31,7 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.Logger; import org.apache.log4j.spi.LoggingEvent; diff --git src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java index ff58b27..e31aaed 100644 --- src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java +++ src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java @@ -237,8 +237,7 @@ public class TestHFileOutputFormat { * metadata used by time-restricted scans. */ @Test - public void test_TIMERANGE() - throws IOException, InterruptedException { + public void test_TIMERANGE() throws Exception { Configuration conf = new Configuration(this.util.getConfiguration()); RecordWriter writer = null; TaskAttemptContext context = null; @@ -249,8 +248,7 @@ public class TestHFileOutputFormat { // build a record writer using HFileOutputFormat Job job = new Job(conf); FileOutputFormat.setOutputPath(job, dir); - context = new TaskAttemptContext(job.getConfiguration(), - new TaskAttemptID()); + context = getTestTaskAttemptContext(job); HFileOutputFormat hof = new HFileOutputFormat(); writer = hof.getRecordWriter(context); diff --git src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java index f522bdb..3d1bce4 100644 --- src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java @@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.ipc.CoprocessorProtocol; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; -import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java index 442cd02..ad4ddaa 100644 --- src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java +++ src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java @@ -64,7 +64,8 @@ public class TestHLog { { ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL); - ((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL); + ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.server.namenode.FSNamesystem")) + .getLogger().setLevel(Level.ALL); ((Log4JLogger)DFSClient.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)HLog.LOG).getLogger().setLevel(Level.ALL); } diff --git src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java index 287f1fb..0f21c2e 100644 --- src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java +++ src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java @@ -76,7 +76,8 @@ public class TestLogRolling { { ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)LeaseManager.LOG).getLogger().setLevel(Level.ALL); - ((Log4JLogger)FSNamesystem.LOG).getLogger().setLevel(Level.ALL); + ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.server.namenode.FSNamesystem")) + .getLogger().setLevel(Level.ALL); ((Log4JLogger)DFSClient.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)HRegionServer.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)HRegion.LOG).getLogger().setLevel(Level.ALL);