Author: stack
Date: Tue Jan 8 22:40:10 2008
New Revision: 610280
URL: http://svn.apache.org/viewvc?rev=610280&view=rev
Log:
HADOOP-2558 fixes for build up on hudson (Part 1)
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=610280&r1=610279&r2=610280&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Jan 8 22:40:10 2008
@@ -106,6 +106,7 @@
(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
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java?rev=610280&r1=610279&r2=610280&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HTable.java
Tue Jan 8 22:40:10 2008
@@ -229,7 +229,6 @@
}
try {
Thread.sleep(this.pause);
-
} catch (InterruptedException x) {
// continue
}
@@ -275,7 +274,6 @@
}
try {
Thread.sleep(this.pause);
-
} catch (InterruptedException x) {
// continue
}
@@ -332,7 +330,6 @@
}
try {
Thread.sleep(this.pause);
-
} catch (InterruptedException x) {
// continue
}
@@ -394,7 +391,6 @@
}
try {
Thread.sleep(this.pause);
-
} catch (InterruptedException x) {
// continue
}
@@ -915,7 +911,6 @@
}
try {
Thread.sleep(pause);
-
} catch (InterruptedException e) {
// continue
}
@@ -1047,7 +1042,11 @@
loadRegions();
}
}
-
+ try {
+ Thread.sleep(pause);
+ } catch (InterruptedException e) {
+ // continue
+ }
} catch (IOException e) {
close();
if (e instanceof RemoteException) {
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java?rev=610280&r1=610279&r2=610280&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/StaticTestEnvironment.java
Tue Jan 8 22:40:10 2008
@@ -118,6 +118,8 @@
// 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);
}
/**
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java?rev=610280&r1=610279&r2=610280&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestMasterAdmin.java
Tue Jan 8 22:40:10 2008
@@ -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 @@
}
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
}
