HBASE-927 We don't recover if HRS hosting -ROOT-/.META. goes down

Rather than just check once if we know the root region location, check every time in case it changes.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@719433 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Kellerman 2008-11-21 00:14:09 +00:00
parent 23564f2cf6
commit 400e183da5
2 changed files with 4 additions and 7 deletions

View File

@ -132,6 +132,7 @@ Release 0.19.0 - Unreleased
the deleted cell
HBASE-675 Report correct server hosting a table split for assignment to
for MR Jobs
HBASE-927 We don't recover if HRS hosting -ROOT-/.META. goes down
NEW FEATURES
HBASE-875 Use MurmurHash instead of JenkinsHash [in bloomfilters]

View File

@ -297,7 +297,6 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
// Now ask master what it wants us to do and tell it what we have done
for (int tries = 0; !stopRequested.get() && isHealthy();) {
// Try to get the root region location from the master.
if (!haveRootRegion.get()) {
HServerAddress rootServer = hbaseMaster.getRootRegionLocation();
if (rootServer != null) {
// By setting the root region location, we bypass the wait imposed on
@ -306,7 +305,6 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
new HRegionLocation(HRegionInfo.ROOT_REGIONINFO, rootServer));
haveRootRegion.set(true);
}
}
long now = System.currentTimeMillis();
if (lastMsg != 0 && (now - lastMsg) >= serverLeaseTimeout) {
// It has been way too long since we last reported to the master.
@ -565,7 +563,6 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
* only called when the HRegionServer receives a kill signal.
*/
private static class ShutdownThread extends Thread {
private final Log LOG = LogFactory.getLog(this.getClass());
private final HRegionServer instance;
/**
@ -591,7 +588,6 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
* compaction.
*/
private static class MajorCompactionChecker extends Chore {
private final Log LOG = LogFactory.getLog(this.getClass());
private final HRegionServer instance;
MajorCompactionChecker(final HRegionServer h,
@ -617,7 +613,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
}
}
}
};
}
/**
* Report the status of the server. A server is online once all the startup