HDFS-3683. Edit log replay progress indicator shows >100% complete. Contributed by Plamen Jeliazkov.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377367 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2012-08-26 00:31:12 +00:00
parent ffd2e01604
commit 56285e1bee
2 changed files with 6 additions and 2 deletions

View File

@ -679,6 +679,9 @@ Branch-2 ( Unreleased changes )
HDFS-3731. 2.0 release upgrade must handle blocks being written from 1.0. HDFS-3731. 2.0 release upgrade must handle blocks being written from 1.0.
(Colin Patrick McCabe via eli) (Colin Patrick McCabe via eli)
HDFS-3683. Edit log replay progress indicator shows >100% complete. (Plamen
Jeliazkov via atm)
BREAKDOWN OF HDFS-3042 SUBTASKS BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd) HDFS-2185. HDFS portion of ZK-based FailoverController (todd)

View File

@ -191,8 +191,9 @@ long loadEditRecords(EditLogInputStream in, boolean closeOnExit,
if (op.hasTransactionId()) { if (op.hasTransactionId()) {
long now = now(); long now = now();
if (now - lastLogTime > REPLAY_TRANSACTION_LOG_INTERVAL) { if (now - lastLogTime > REPLAY_TRANSACTION_LOG_INTERVAL) {
int percent = Math.round((float)lastAppliedTxId / numTxns * 100); long deltaTxId = lastAppliedTxId - expectedStartingTxId + 1;
LOG.info("replaying edit log: " + lastAppliedTxId + "/" + numTxns int percent = Math.round((float) deltaTxId / numTxns * 100);
LOG.info("replaying edit log: " + deltaTxId + "/" + numTxns
+ " transactions completed. (" + percent + "%)"); + " transactions completed. (" + percent + "%)");
lastLogTime = now; lastLogTime = now;
} }