hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: HDFS-11352. Potential deadlock in NN when failing over. Contributed by Erik Krogen.
Date Tue, 24 Jan 2017 05:56:38 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 b0b396685 -> 3acc96edb


HDFS-11352. Potential deadlock in NN when failing over. Contributed by Erik Krogen.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3acc96ed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3acc96ed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3acc96ed

Branch: refs/heads/branch-2.7
Commit: 3acc96edbf3f389a780face80d778c57087199d3
Parents: b0b3966
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Tue Jan 24 14:55:27 2017 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Tue Jan 24 14:55:27 2017 +0900

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3acc96ed/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 c7f8508..96bcfef 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
@@ -4768,7 +4768,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
   @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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message