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

HADOOP-2558 fixes for build up on hudson (Part 1) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@610280 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-01-09 06:40:10 +00:00
parent a22bf5e1e2
commit 3d80b1a498
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -106,6 +106,7 @@ Trunk (unreleased changes)
(Bryan Duxbury via Stack)
HADOOP-2530 Missing type in new hbase custom RPC serializer
HADOOP-2490 Failure in nightly #346 (Added debugging of hudson failures).
HADOOP-2558 fixes for build up on hudson (part 1)
IMPROVEMENTS
HADOOP-2401 Add convenience put method that takes writable

11
src/java/org/apache/hadoop/hbase/HTable.java
View File

@ -229,7 +229,6 @@ public class HTable implements HConstants {
}
try {
Thread.sleep(this.pause);
} catch (InterruptedException x) {
// continue
}
@ -275,7 +274,6 @@ public class HTable implements HConstants {
}
try {
Thread.sleep(this.pause);
} catch (InterruptedException x) {
// continue
}
@ -332,7 +330,6 @@ public class HTable implements HConstants {
}
try {
Thread.sleep(this.pause);
} catch (InterruptedException x) {
// continue
}
@ -394,7 +391,6 @@ public class HTable implements HConstants {
}
try {
Thread.sleep(this.pause);
} catch (InterruptedException x) {
// continue
}
@ -915,7 +911,6 @@ public class HTable implements HConstants {
}
try {
Thread.sleep(pause);
} catch (InterruptedException e) {
// continue
}
@ -1047,7 +1042,11 @@ public class HTable implements HConstants {
loadRegions();
}
}
try {
Thread.sleep(pause);
} catch (InterruptedException e) {
// continue
}
} catch (IOException e) {
close();
if (e instanceof RemoteException) {

2
src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
View File

@ -118,6 +118,8 @@ public class StaticTestEnvironment {
// It is way too noisy.
Logger.getLogger("org.apache.hadoop.hbase.filter").setLevel(Level.INFO);
}
// Enable mapreduce loggging for the mapreduce jobs.
Logger.getLogger("org.apache.hadoop.mapred").setLevel(Level.DEBUG);
}
/**

12
src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
View File

@ -19,10 +19,14 @@
*/
package org.apache.hadoop.hbase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.Text;
/** tests administrative functions */
public class TestMasterAdmin extends HBaseClusterTestCase {
private final Log LOG = LogFactory.getLog(this.getClass().getName());
private static final Text COLUMN_NAME = new Text("col1:");
private static HTableDescriptor testDesc;
static {
@ -55,17 +59,17 @@ public class TestMasterAdmin extends HBaseClusterTestCase {
}
assertTrue(exception);
admin.createTable(testDesc);
LOG.info("Table " + testDesc.getName().toString() + " created");
admin.disableTable(testDesc.getName());
LOG.info("Table " + testDesc.getName().toString() + " disabled");
try {
@SuppressWarnings("unused")
HTable table = new HTable(conf, testDesc.getName());
} catch(IllegalStateException e) {
} catch (IllegalStateException e) {
// Expected
// This exception is not actually thrown. It doesn't look like it should
// thrown since the connection manager is already filled w/ data
// throw since the connection manager is already filled w/ data
// -- noticed by St.Ack 09/09/2007
}