You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2013/08/16 23:55:31 UTC
svn commit: r1514904 - in /hbase/branches/0.94/src:
main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java
Author: mbertozzi
Date: Fri Aug 16 21:55:30 2013
New Revision: 1514904
URL: http://svn.apache.org/r1514904
Log:
HBASE-9233 isTableAvailable() may be stuck if an offline parent was never assigned
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1514904&r1=1514903&r2=1514904&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Fri Aug 16 21:55:30 2013
@@ -892,7 +892,7 @@ public class HConnectionManager {
byte[] value = row.getValue(HConstants.CATALOG_FAMILY,
HConstants.REGIONINFO_QUALIFIER);
HRegionInfo info = Writables.getHRegionInfoOrNull(value);
- if (info != null) {
+ if (info != null && !info.isSplitParent()) {
if (Bytes.equals(tableName, info.getTableName())) {
value = row.getValue(HConstants.CATALOG_FAMILY,
HConstants.SERVER_QUALIFIER);
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java?rev=1514904&r1=1514903&r2=1514904&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java Fri Aug 16 21:55:30 2013
@@ -125,6 +125,7 @@ public class TestCreateTableHandler {
}
}
assertTrue(TEST_UTIL.getHBaseAdmin().isTableEnabled(tableName));
+ assertTrue(TEST_UTIL.getHBaseAdmin().isTableAvailable(tableName));
List<HRegionInfo> regions = m.getAssignmentManager().getRegionsOfTable(tableName);
assertFalse("Split parent should not be assigned", regions.contains(parent));
}