Repository: hadoop Updated Branches: refs/heads/branch-2.8 fece3c881 -> c2bb9bf00
HDFS-10485. Fix findbugs warning in FSEditLog.java. (aajisaka) (cherry picked from commit e620530301fd3e62537d4b7bc3d8ed296bda1ffc) (cherry picked from commit b8c1db6f63f9d01f44f8f43921aadfe999eefd76) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a17fc1dc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a17fc1dc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a17fc1dc Branch: refs/heads/branch-2.8 Commit: a17fc1dca3e9a115fd53dc17f73cc64a1efa8008 Parents: e327325 Author: Akira Ajisaka <[email protected]> Authored: Tue Jun 7 17:52:03 2016 +0900 Committer: Zhe Zhang <[email protected]> Committed: Mon Oct 31 16:24:35 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/namenode/FSEditLog.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a17fc1dc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java index 9247642..3eda0f5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -175,7 +176,7 @@ public class FSEditLog implements LogsPurgeable { // these are statistics counters. private long numTransactions; // number of transactions - private long numTransactionsBatchedInSync; + private final AtomicLong numTransactionsBatchedInSync = new AtomicLong(); private long totalTimeTransactions; // total time for all transactions private NameNodeMetrics metrics; @@ -673,7 +674,7 @@ public class FSEditLog implements LogsPurgeable { if (metrics != null) { // Metrics non-null only when used inside name node metrics.addSync(elapsed); metrics.incrTransactionsBatchedInSync(editsBatchedInSync); - numTransactionsBatchedInSync += editsBatchedInSync; + numTransactionsBatchedInSync.addAndGet(editsBatchedInSync); } } finally { @@ -713,7 +714,7 @@ public class FSEditLog implements LogsPurgeable { buf.append(" Total time for transactions(ms): "); buf.append(totalTimeTransactions); buf.append(" Number of transactions batched in Syncs: "); - buf.append(numTransactionsBatchedInSync); + buf.append(numTransactionsBatchedInSync.get()); buf.append(" Number of syncs: "); buf.append(editLogStream.getNumSync()); buf.append(" SyncTimes(ms): "); @@ -1251,7 +1252,9 @@ public class FSEditLog implements LogsPurgeable { "Cannot start log segment at txid %s when next expected " + "txid is %s", segmentTxId, txid + 1); - numTransactions = totalTimeTransactions = numTransactionsBatchedInSync = 0; + numTransactions = 0; + totalTimeTransactions = 0; + numTransactionsBatchedInSync.set(0L); // TODO no need to link this back to storage anymore! // See HDFS-2174. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
