Backport of HDFS-3611 from trunk. svn merge -c 1360001 ../../trunk (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360002 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-07-11 03:37:55 +00:00
parent 0b91df4d1a
commit 6ff0e1fc3a
2 changed files with 7 additions and 3 deletions

View File

@ -121,6 +121,8 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3613. GSet prints some INFO level values, which aren't HDFS-3613. GSet prints some INFO level values, which aren't
really very useful to all (Andrew Wang via harsh) really very useful to all (Andrew Wang via harsh)
HDFS-3611. NameNode prints unnecessary WARNs about edit log normally skipping a few bytes. (Colin Patrick McCabe via harsh)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-2982. Startup performance suffers when there are many edit log HDFS-2982. Startup performance suffers when there are many edit log

View File

@ -164,9 +164,11 @@ public class EditLogFileInputStream extends EditLogInputStream {
// //
long skipAmt = file.length() - tracker.getPos(); long skipAmt = file.length() - tracker.getPos();
if (skipAmt > 0) { if (skipAmt > 0) {
LOG.warn("skipping " + skipAmt + " bytes at the end " + if (LOG.isDebugEnabled()) {
"of edit log '" + getName() + "': reached txid " + txId + LOG.debug("skipping " + skipAmt + " bytes at the end " +
" out of " + lastTxId); "of edit log '" + getName() + "': reached txid " + txId +
" out of " + lastTxId);
}
tracker.clearLimit(); tracker.clearLimit();
IOUtils.skipFully(tracker, skipAmt); IOUtils.skipFully(tracker, skipAmt);
} }