From 336abbd8737f3dff38f7bdad9721511c711c522b Mon Sep 17 00:00:00 2001 From: Surendra Singh Lilhore Date: Mon, 14 Oct 2019 23:31:43 +0530 Subject: [PATCH] HDFS-14886. In NameNode Web UI's Startup Progress page, Loading edits always shows 0 sec. Contributed by hemanthboyina. --- .../java/org/apache/hadoop/hdfs/server/namenode/FSImage.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java index 56818075652..9b95f14bddc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java @@ -757,8 +757,10 @@ LayoutVersion.Feature.TXID_BASED_LAYOUT, getLayoutVersion())) { 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 long loadEdits(Iterable editStreams, 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 long loadEdits(Iterable editStreams, } finally { FSEditLog.closeAllStreams(editStreams); } - prog.endPhase(Phase.LOADING_EDITS); return lastAppliedTxId - prevLastAppliedTxId; }