Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10485. Fix findbugs warning in FSEditLog.java. (aajisaka) 

(cherry picked from commit e620530301)
(cherry picked from commit b8c1db6f63)
This commit is contained in:
Akira Ajisaka 2016-06-07 17:52:03 +09:00 committed by Zhe Zhang
parent e327325a37
commit a17fc1dca3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
View File

@ -27,6 +27,7 @@
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 @@ private enum State {
// 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 @@ protected void logSync(long mytxid) {
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 @@ private void printStatistics(boolean force) {
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 @@ synchronized void startLogSegment(final long segmentTxId,
"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.