HBASE-1065 Minor logging improvements in the master
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@727151 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6e9aa2affa
commit
369300f015
|
@ -174,6 +174,7 @@ Release 0.19.0 - Unreleased
|
||||||
HBASE-1048 HLog: Found 0 logs to remove out of total 1450; oldest
|
HBASE-1048 HLog: Found 0 logs to remove out of total 1450; oldest
|
||||||
outstanding seqnum is 162297053 fr om region -ROOT-,,0
|
outstanding seqnum is 162297053 fr om region -ROOT-,,0
|
||||||
HBASE-1055 Better vm stats on startup
|
HBASE-1055 Better vm stats on startup
|
||||||
|
HBASE-1065 Minor logging improvements in the master
|
||||||
|
|
||||||
NEW FEATURES
|
NEW FEATURES
|
||||||
HBASE-875 Use MurmurHash instead of JenkinsHash [in bloomfilters]
|
HBASE-875 Use MurmurHash instead of JenkinsHash [in bloomfilters]
|
||||||
|
|
|
@ -109,11 +109,6 @@ class ProcessServerShutdown extends RegionServerOperation {
|
||||||
}
|
}
|
||||||
|
|
||||||
byte [] row = values.getRow();
|
byte [] row = values.getRow();
|
||||||
|
|
||||||
if (LOG.isDebugEnabled() && row != null) {
|
|
||||||
LOG.debug("shutdown scanner looking at " + Bytes.toString(row));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check server name. If null, be conservative and treat as though
|
// Check server name. If null, be conservative and treat as though
|
||||||
// region had been on shutdown server (could be null because we
|
// region had been on shutdown server (could be null because we
|
||||||
// missed edits in hlog because hdfs does not do write-append).
|
// missed edits in hlog because hdfs does not do write-append).
|
||||||
|
@ -124,7 +119,11 @@ class ProcessServerShutdown extends RegionServerOperation {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bingo! Found it.
|
if (LOG.isDebugEnabled() && row != null) {
|
||||||
|
LOG.debug("Shutdown scanner for " + serverName + " processing " +
|
||||||
|
Bytes.toString(row));
|
||||||
|
}
|
||||||
|
|
||||||
HRegionInfo info = master.getHRegionInfo(row, values);
|
HRegionInfo info = master.getHRegionInfo(row, values);
|
||||||
if (info == null) {
|
if (info == null) {
|
||||||
emptyRows.add(row);
|
emptyRows.add(row);
|
||||||
|
|
|
@ -424,9 +424,10 @@ class RegionManager implements HConstants {
|
||||||
|
|
||||||
int regionIdx = 0;
|
int regionIdx = 0;
|
||||||
int regionsClosed = 0;
|
int regionsClosed = 0;
|
||||||
while (regionsClosed < numRegionsToClose && regionIdx < mostLoadedRegions.length) {
|
int skippedClosing = 0;
|
||||||
|
while (regionsClosed < numRegionsToClose &&
|
||||||
|
regionIdx < mostLoadedRegions.length) {
|
||||||
HRegionInfo currentRegion = mostLoadedRegions[regionIdx];
|
HRegionInfo currentRegion = mostLoadedRegions[regionIdx];
|
||||||
|
|
||||||
regionIdx++;
|
regionIdx++;
|
||||||
// skip the region if it's meta or root
|
// skip the region if it's meta or root
|
||||||
if (currentRegion.isRootRegion() || currentRegion.isMetaTable()) {
|
if (currentRegion.isRootRegion() || currentRegion.isMetaTable()) {
|
||||||
|
@ -434,13 +435,12 @@ class RegionManager implements HConstants {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isClosing(currentRegion.getRegionName())) {
|
if (isClosing(currentRegion.getRegionName())) {
|
||||||
LOG.info("Skipping region " + currentRegion.getRegionNameAsString()
|
skippedClosing++;
|
||||||
+ " because it is already closing.");
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG.debug("Going to close region " + currentRegion.getRegionNameAsString());
|
LOG.debug("Going to close region " +
|
||||||
|
currentRegion.getRegionNameAsString());
|
||||||
// make a message to close the region
|
// make a message to close the region
|
||||||
returnMsgs.add(new HMsg(HMsg.Type.MSG_REGION_CLOSE, currentRegion,
|
returnMsgs.add(new HMsg(HMsg.Type.MSG_REGION_CLOSE, currentRegion,
|
||||||
OVERLOADED));
|
OVERLOADED));
|
||||||
|
@ -449,6 +449,7 @@ class RegionManager implements HConstants {
|
||||||
// increment the count of regions we've marked
|
// increment the count of regions we've marked
|
||||||
regionsClosed++;
|
regionsClosed++;
|
||||||
}
|
}
|
||||||
|
LOG.info("Skipped " + skippedClosing + " region(s) as already closing");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue