Repository: hadoop Updated Branches: refs/heads/branch-2 30791cb0d -> 5e5e693a0
HDFS-9332. Fix Precondition failures from NameNodeEditLogRoller while saving namespace. (cherry picked from commit 888c6245e20ba6bdaa57d16b5c62b4a9eda2cdaf) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5e5e693a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5e5e693a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5e5e693a Branch: refs/heads/branch-2 Commit: 5e5e693a0a3591538e142ca9bf8d0af24cb4db68 Parents: 30791cb Author: Andrew Wang <[email protected]> Authored: Thu Oct 29 11:30:47 2015 -0700 Committer: Andrew Wang <[email protected]> Committed: Thu Oct 29 11:30:52 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e5e693a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 1399409..52775a8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1361,6 +1361,9 @@ Release 2.8.0 - UNRELEASED HDFS-9044. Give Priority to FavouredNodes , before selecting nodes from FavouredNode's Node Group (J.Andreina via vinayakumarb) + HDFS-9332. Fix Precondition failures from NameNodeEditLogRoller while + saving namespace. (wang) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e5e693a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 72d6dfe..2c09a2b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -3674,9 +3674,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, public void run() { while (fsRunning && shouldRun) { try { - FSEditLog editLog = getFSImage().getEditLog(); - long numEdits = - editLog.getLastWrittenTxId() - editLog.getCurSegmentTxId(); + long numEdits = getTransactionsSinceLastLogRoll(); if (numEdits > rollThreshold) { FSNamesystem.LOG.info("NameNode rolling its own edit log because" + " number of edits in open segment exceeds threshold of "
