HDFS-14886. In NameNode Web UI's Startup Progress page, Loading edits always shows 0 sec. Contributed by hemanthboyina.
(cherry picked from commit 336abbd873
)
This commit is contained in:
parent
793df595f2
commit
d1b30e8450
|
@ -757,8 +757,10 @@ public class FSImage implements Closeable {
|
|||
prog.endPhase(Phase.LOADING_FSIMAGE);
|
||||
|
||||
if (!rollingRollback) {
|
||||
prog.beginPhase(Phase.LOADING_EDITS);
|
||||
long txnsAdvanced = loadEdits(editStreams, target, Long.MAX_VALUE,
|
||||
startOpt, recovery);
|
||||
prog.endPhase(Phase.LOADING_EDITS);
|
||||
needToSave |= needsResaveBasedOnStaleCheckpoint(imageFile.getFile(),
|
||||
txnsAdvanced);
|
||||
} else {
|
||||
|
@ -890,8 +892,6 @@ public class FSImage implements Closeable {
|
|||
StartupOption startOpt, MetaRecoveryContext recovery)
|
||||
throws IOException {
|
||||
LOG.debug("About to load edits:\n " + Joiner.on("\n ").join(editStreams));
|
||||
StartupProgress prog = NameNode.getStartupProgress();
|
||||
prog.beginPhase(Phase.LOADING_EDITS);
|
||||
|
||||
long prevLastAppliedTxId = lastAppliedTxId;
|
||||
long remainingReadTxns = maxTxnsToRead;
|
||||
|
@ -930,7 +930,6 @@ public class FSImage implements Closeable {
|
|||
} finally {
|
||||
FSEditLog.closeAllStreams(editStreams);
|
||||
}
|
||||
prog.endPhase(Phase.LOADING_EDITS);
|
||||
return lastAppliedTxId - prevLastAppliedTxId;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue