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 2011/07/13 23:47:13 UTC
svn commit: r1146495 - in /hbase/trunk/src:
main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
Author: stack
Date: Wed Jul 13 21:47:12 2011
New Revision: 1146495
URL: http://svn.apache.org/viewvc?rev=1146495&view=rev
Log:
Fix broken TestMasterFailover test -- needed .tableinfo defined before test started... part of the repercussions from hbase-451; I don't this fixes all TestMasterFailover failures but at least a few obvious failures
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1146495&r1=1146494&r2=1146495&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Jul 13 21:47:12 2011
@@ -2620,8 +2620,8 @@ public class HRegionServer implements HR
*/
protected void checkOpen() throws IOException {
if (this.stopped || this.abortRequested) {
- throw new RegionServerStoppedException("Server not running"
- + (this.abortRequested ? ", aborting" : ""));
+ throw new RegionServerStoppedException("Server " + getServerName() +
+ " not running" + (this.abortRequested ? ", aborting" : ""));
}
if (!fsOk) {
throw new RegionServerStoppedException("File system not available");
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java?rev=1146495&r1=1146494&r2=1146495&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java Wed Jul 13 21:47:12 2011
@@ -41,6 +41,7 @@ import org.apache.hadoop.hbase.master.Lo
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.JVMClusterUtil;
import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
import org.apache.hadoop.hbase.zookeeper.ZKAssign;
@@ -262,6 +263,9 @@ public class TestMasterFailover {
FileSystem filesystem = FileSystem.get(conf);
Path rootdir = filesystem.makeQualified(
new Path(conf.get(HConstants.HBASE_DIR)));
+ // Write the .tableinfo
+ FSUtils.createTableDescriptor(filesystem, rootdir, htdEnabled);
+
HRegionInfo hriEnabled = new HRegionInfo(htdEnabled.getName(), null, null);
HRegion.createHRegion(hriEnabled, rootdir, conf, htdEnabled);
@@ -271,6 +275,8 @@ public class TestMasterFailover {
byte [] disabledTable = Bytes.toBytes("disabledTable");
HTableDescriptor htdDisabled = new HTableDescriptor(disabledTable);
htdDisabled.addFamily(new HColumnDescriptor(FAMILY));
+ // Write the .tableinfo
+ FSUtils.createTableDescriptor(filesystem, rootdir, htdDisabled);
HRegionInfo hriDisabled = new HRegionInfo(htdDisabled.getName(), null, null);
HRegion.createHRegion(hriDisabled, rootdir, conf, htdDisabled);
List<HRegionInfo> disabledRegions = TEST_UTIL.createMultiRegionsInMeta(
@@ -574,7 +580,8 @@ public class TestMasterFailover {
FileSystem filesystem = FileSystem.get(conf);
Path rootdir = filesystem.makeQualified(
new Path(conf.get(HConstants.HBASE_DIR)));
-
+ // Write the .tableinfo
+ FSUtils.createTableDescriptor(filesystem, rootdir, htdEnabled);
HRegionInfo hriEnabled = new HRegionInfo(htdEnabled.getName(),
null, null);
HRegion.createHRegion(hriEnabled, rootdir, conf, htdEnabled);
@@ -585,6 +592,8 @@ public class TestMasterFailover {
byte [] disabledTable = Bytes.toBytes("disabledTable");
HTableDescriptor htdDisabled = new HTableDescriptor(disabledTable);
htdDisabled.addFamily(new HColumnDescriptor(FAMILY));
+ // Write the .tableinfo
+ FSUtils.createTableDescriptor(filesystem, rootdir, htdDisabled);
HRegionInfo hriDisabled = new HRegionInfo(htdDisabled.getName(), null, null);
HRegion.createHRegion(hriDisabled, rootdir, conf, htdDisabled);
@@ -811,7 +820,7 @@ public class TestMasterFailover {
log("Starting up a new master");
master = cluster.startMaster().getMaster();
log("Waiting for master to be ready");
- cluster.waitForActiveAndReadyMaster();
+ assertTrue(cluster.waitForActiveAndReadyMaster());
log("Master is ready");
// Let's add some weird states to master in-memory state
@@ -871,8 +880,12 @@ public class TestMasterFailover {
// Grab all the regions that are online across RSs
Set<HRegionInfo> onlineRegions = new TreeSet<HRegionInfo>();
for (JVMClusterUtil.RegionServerThread rst :
- cluster.getRegionServerThreads()) {
- onlineRegions.addAll(rst.getRegionServer().getOnlineRegions());
+ cluster.getRegionServerThreads()) {
+ try {
+ onlineRegions.addAll(rst.getRegionServer().getOnlineRegions());
+ } catch (org.apache.hadoop.hbase.regionserver.RegionServerStoppedException e) {
+ LOG.info("Got RegionServerStoppedException", e);
+ }
}
// Now, everything that should be online should be online