Author: stack
Date: Fri Oct 8 22:50:40 2010
New Revision: 1006065
URL: http://svn.apache.org/viewvc?rev=1006065&view=rev
Log:
HBASE-3089 REST tests are broken locally and up in hudson; some minor changes
that should have been included on last commit
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1006065&r1=1006064&r2=1006065&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
Fri Oct 8 22:50:40 2010
@@ -120,7 +120,6 @@ class CatalogJanitor extends Chore {
* @return Null if not found (and logs fact that expected COL_REGIONINFO
* was missing) else deserialized {...@link HRegionInfo}
* @throws IOException
- * @throws NullPointerException if null cell
*/
static HRegionInfo getHRegionInfo(final Result result)
throws IOException {
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java?rev=1006065&r1=1006064&r2=1006065&view=diff
==============================================================================
---
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
(original)
+++
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
Fri Oct 8 22:50:40 2010
@@ -46,6 +46,8 @@ public class TestScannerTimeout {
private final static byte[] SOME_BYTES = Bytes.toBytes("f");
private final static byte[] TABLE_NAME = Bytes.toBytes("t");
private final static int NB_ROWS = 10;
+ // Be careful w/ what you set this timer too... it can get in the way of
+ // the mini cluster coming up -- the verification in particular.
private final static int SCANNER_TIMEOUT = 10000;
/**
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java?rev=1006065&r1=1006064&r2=1006065&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
Fri Oct 8 22:50:40 2010
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.util;
import java.io.IOException;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.AbstractMergeTestBase;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.util.HMerge;
@@ -36,8 +37,9 @@ public class TestMergeTable extends Abst
*/
public void testMergeTable() throws IOException {
assertNotNull(dfsCluster);
- HBaseAdmin admin = new HBaseAdmin(conf);
+ Configuration c = new Configuration(this.conf);
+ HBaseAdmin admin = new HBaseAdmin(c);
admin.disableTable(desc.getName());
- HMerge.merge(conf, dfsCluster.getFileSystem(), desc.getName());
+ HMerge.merge(c, dfsCluster.getFileSystem(), desc.getName());
}
}
\ No newline at end of file
