diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index a30f45999c3..916df8b466a 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -157,13 +157,6 @@ limitations under the License. com.yammer.metrics metrics-core - - - org.apache.hadoop - hadoop-minicluster - ${hadoop-two.version} - commons-lang commons-lang diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 6fbc03e27e2..5cff492dc38 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -347,10 +347,6 @@ com.github.stephenc.high-scale-lib high-scale-lib - - commons-codec - commons-codec - commons-io commons-io @@ -423,10 +419,6 @@ org.codehaus.jackson jackson-jaxrs - - org.codehaus.jackson - jackson-xc - tomcat jasper-compiler @@ -465,11 +457,6 @@ stax-api - - org.codehaus.jettison - jettison - test - org.cloudera.htrace htrace-core @@ -625,18 +612,10 @@ hadoop-hdfs test-jar - - org.apache.hadoop - hadoop-client - org.apache.hadoop hadoop-annotations - - org.apache.hadoop - hadoop-minicluster - diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java index e4b69d609da..9212f415807 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HConnectionManager; -import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -63,12 +62,9 @@ import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Hash; import org.apache.hadoop.hbase.util.MurmurHash; import org.apache.hadoop.hbase.util.Pair; -import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; -import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.NullWritable; @@ -122,7 +118,6 @@ public class PerformanceEvaluation extends Configured implements Tool { protected Map commands = new TreeMap(); - private boolean miniCluster = false; private boolean nomapred = false; private int rowPrefixLength = DEFAULT_ROW_PREFIX_LENGTH; private int N = 1; @@ -1246,43 +1241,14 @@ public class PerformanceEvaluation extends Configured implements Tool { } private void runTest(final Class cmd) throws IOException, - InterruptedException, ClassNotFoundException { - MiniHBaseCluster hbaseMiniCluster = null; - MiniDFSCluster dfsCluster = null; - MiniZooKeeperCluster zooKeeperCluster = null; - Configuration conf = getConf(); - if (this.miniCluster) { - dfsCluster = new MiniDFSCluster(conf, 2, true, (String[])null); - zooKeeperCluster = new MiniZooKeeperCluster(conf); - int zooKeeperPort = zooKeeperCluster.startup(new File(System.getProperty("java.io.tmpdir"))); - - // mangle the conf so that the fs parameter points to the minidfs we - // just started up - FileSystem fs = dfsCluster.getFileSystem(); - FSUtils.setFsDefault(conf, new Path(fs.getUri())); - conf.set(HConstants.ZOOKEEPER_CLIENT_PORT, Integer.toString(zooKeeperPort)); - Path parentdir = fs.getHomeDirectory(); - FSUtils.setRootDir(conf, parentdir); - fs.mkdirs(parentdir); - FSUtils.setVersion(fs, parentdir); - hbaseMiniCluster = new MiniHBaseCluster(conf, N); - } - - try { - if (N == 1) { - // If there is only one client and one HRegionServer, we assume nothing - // has been set up at all. - runNIsOne(cmd); - } else { - // Else, run - runNIsMoreThanOne(cmd); - } - } finally { - if(this.miniCluster) { - if (hbaseMiniCluster != null) hbaseMiniCluster.shutdown(); - if (zooKeeperCluster != null) zooKeeperCluster.shutdown(); - HBaseTestCase.shutdownDfs(dfsCluster); - } + InterruptedException, ClassNotFoundException { + if (N == 1) { + // If there is only one client and one HRegionServer, we assume nothing + // has been set up at all. + runNIsOne(cmd); + } else { + // Else, run + runNIsMoreThanOne(cmd); } } @@ -1295,11 +1261,10 @@ public class PerformanceEvaluation extends Configured implements Tool { System.err.println(message); } System.err.println("Usage: java " + this.getClass().getName() + " \\"); - System.err.println(" [--miniCluster] [--nomapred] [--rows=ROWS] [--table=NAME] \\"); + System.err.println(" [--nomapred] [--rows=ROWS] [--table=NAME] \\"); System.err.println(" [--compress=TYPE] [--blockEncoding=TYPE] [-D]* "); System.err.println(); System.err.println("Options:"); - System.err.println(" miniCluster Run the test on an HBaseMiniCluster"); System.err.println(" nomapred Run multiple clients using threads " + "(rather than use mapreduce)"); System.err.println(" rows Rows each client runs. Default: One million"); @@ -1362,12 +1327,6 @@ public class PerformanceEvaluation extends Configured implements Tool { break; } - final String miniClusterArgKey = "--miniCluster"; - if (cmd.startsWith(miniClusterArgKey)) { - this.miniCluster = true; - continue; - } - final String nmr = "--nomapred"; if (cmd.startsWith(nmr)) { this.nomapred = true;