Repository: hadoop Updated Branches: refs/heads/branch-2.6 67065e228 -> 8aff157e2
HDFS-11352. Potential deadlock in NN when failing over. Contributed by Eric Krogen. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8aff157e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8aff157e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8aff157e Branch: refs/heads/branch-2.6 Commit: 8aff157e2db814faca830e53c9eaadae726ef81a Parents: 67065e2 Author: Akira Ajisaka <aajis...@apache.org> Authored: Tue Jan 24 15:02:20 2017 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Tue Jan 24 15:02:20 2017 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8aff157e/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 9b06f2f..4b17365 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -18,6 +18,9 @@ Release 2.6.6 - UNRELEASED HDFS-11290. TestFSNameSystemMBean should wait until JMX cache is cleared. (Eric Krogen via aajisaka) + HDFS-11352. Potential deadlock in NN when failing over. + (Eric Krogen via aajisaka) + Release 2.6.5 - 2016-10-08 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8aff157e/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 ba92508..c88080a 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 @@ -5368,7 +5368,7 @@ public class FSNamesystem implements Namesystem, FSClusterStats, @Metric({"TransactionsSinceLastCheckpoint", "Number of transactions since last checkpoint"}) public long getTransactionsSinceLastCheckpoint() { - return getEditLog().getLastWrittenTxId() - + return getEditLog().getLastWrittenTxIdWithoutLock() - getFSImage().getStorage().getMostRecentCheckpointTxId(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
