You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2015/11/03 22:09:26 UTC
[10/50] hadoop git commit: HDFS-9332. Fix Precondition failures from
NameNodeEditLogRoller while saving namespace.
HDFS-9332. Fix Precondition failures from NameNodeEditLogRoller while saving namespace.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/888c6245
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/888c6245
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/888c6245
Branch: refs/heads/HDFS-8966
Commit: 888c6245e20ba6bdaa57d16b5c62b4a9eda2cdaf
Parents: 8def51a
Author: Andrew Wang <wa...@apache.org>
Authored: Thu Oct 29 11:30:47 2015 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Thu Oct 29 11:30:47 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/888c6245/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 36a70b8..fd1d6de 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2196,6 +2196,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/888c6245/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 29ee087..8d70fbc 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
@@ -3729,9 +3729,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 "