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 aa...@apache.org on 2016/06/07 08:53:34 UTC
hadoop git commit: HDFS-10485. Fix findbugs warning in
FSEditLog.java. (aajisaka)
Repository: hadoop
Updated Branches:
refs/heads/trunk bddea5fe5 -> e62053030
HDFS-10485. Fix findbugs warning in FSEditLog.java. (aajisaka)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e6205303
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e6205303
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e6205303
Branch: refs/heads/trunk
Commit: e620530301fd3e62537d4b7bc3d8ed296bda1ffc
Parents: bddea5f
Author: Akira Ajisaka <aa...@apache.org>
Authored: Tue Jun 7 17:52:03 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Tue Jun 7 17:52:55 2016 +0900
----------------------------------------------------------------------
.../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/e6205303/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 809d9e6..57229da 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;
@@ -174,7 +175,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;
@@ -672,7 +673,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 {
@@ -712,7 +713,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): ");
@@ -1281,7 +1282,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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org