You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2008/06/19 07:55:10 UTC
svn commit: r669392 - in /hadoop/hbase/trunk: ./
src/java/org/apache/hadoop/hbase/ src/java/org/apache/hadoop/hbase/client/
src/test/org/apache/hadoop/hbase/ src/test/org/apache/hadoop/hbase/util/
Author: stack
Date: Wed Jun 18 22:55:09 2008
New Revision: 669392
URL: http://svn.apache.org/viewvc?rev=669392&view=rev
Log:
HBASE-699 Fix TestMigrate up on Hudson
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/util/TestMigrate.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=669392&r1=669391&r2=669392&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Jun 18 22:55:09 2008
@@ -60,6 +60,7 @@
HBASE-652 dropping table fails silently if table isn't disabled
HBASE-683 can not get svn revision # at build time if locale is not english
(Rong-En Fan via Stack)
+ HBASE-699 Fix TestMigrate up on Hudson
IMPROVEMENTS
HBASE-559 MR example job to count table rows
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java?rev=669392&r1=669391&r2=669392&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java Wed Jun 18 22:55:09 2008
@@ -76,7 +76,7 @@
throws IOException {
HConnection connection = HConnectionManager.getConnection(conf);
boolean masterIsRunning = connection.isMasterRunning();
- HConnectionManager.deleteConnection(conf);
+ HConnectionManager.deleteConnectionInfo(conf);
if (Bytes.equals(tableName, META_TABLE_NAME)) {
if (masterIsRunning) {
throw new IllegalStateException(
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=669392&r1=669391&r2=669392&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java Wed Jun 18 22:55:09 2008
@@ -97,11 +97,21 @@
* Delete connection information for the instance specified by the configuration
* @param conf
*/
- public static void deleteConnection(HBaseConfiguration conf) {
+ public static void deleteConnectionInfo(HBaseConfiguration conf) {
synchronized (HBASE_INSTANCES) {
HBASE_INSTANCES.remove(conf.get(HBASE_DIR));
}
}
+
+ /**
+ * Clear the static map of connection info.
+ */
+ public static void deleteConnectionInfo() {
+ synchronized (HBASE_INSTANCES) {
+ HBASE_INSTANCES.clear();
+ }
+ }
+
/* Encapsulates finding the servers for an HBase instance */
private static class TableServers implements HConnection, HConstants {
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java?rev=669392&r1=669391&r2=669392&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java Wed Jun 18 22:55:09 2008
@@ -332,7 +332,12 @@
public byte [] getTableName() {
return this.tableName;
}
-
+
+ /**
+ * Used by unit tests and tools to do low-level manipulations. Not for
+ * general use.
+ * @return An HConnection instance.
+ */
public HConnection getConnection() {
return this.connection;
}
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java?rev=669392&r1=669391&r2=669392&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java Wed Jun 18 22:55:09 2008
@@ -145,7 +145,7 @@
protected void tearDown() throws Exception {
super.tearDown();
try {
- HConnectionManager.deleteConnection(conf);
+ HConnectionManager.deleteConnectionInfo(conf);
if (this.cluster != null) {
try {
this.cluster.shutdown();
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/util/TestMigrate.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/util/TestMigrate.java?rev=669392&r1=669391&r2=669392&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/util/TestMigrate.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/util/TestMigrate.java Wed Jun 18 22:55:09 2008
@@ -129,7 +129,7 @@
// Delete any cached connections. Need to do this because connection was
// created earlier when no master was around. The fact that there was no
// master gets cached. Need to delete so we go get master afresh.
- HConnectionManager.deleteConnection(this.conf);
+ HConnectionManager.deleteConnectionInfo();
LOG.info("Start a cluster against migrated FS");
// Up number of retries. Needed while cluster starts up. Its been set to 1
@@ -153,10 +153,9 @@
LOG.info(TABLENAME + " exists. Now waiting till startcode " +
"changes before opening a scanner");
waitOnStartCodeChange(retries);
+ // Delete again so we go get it all fresh.
+ HConnectionManager.deleteConnectionInfo();
HTable t = new HTable(this.conf, TABLENAME);
- // Force client to relocate the region now the start code has changed
- t.getConnection().relocateRegion(Bytes.toBytes(TABLENAME),
- HConstants.EMPTY_BYTE_ARRAY);
int count = 0;
LOG.info("OPENING SCANNER");
Scanner s = t.getScanner(TABLENAME_COLUMNS);
@@ -175,6 +174,7 @@
s.close();
}
} finally {
+ HConnectionManager.deleteConnectionInfo();
cluster.shutdown();
}
}