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

HDFS-9467. Fix data race accessing writeLockHeldTimeStamp in FSNamesystem. Contributed by Mingliang Liu. 

(cherry picked from commit e556c35b05)
This commit is contained in:
Jing Zhao 2015-11-25 14:21:06 -08:00
parent 9c1ef648a9
commit 288cf8437b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1538,6 +1538,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9407. TestFileTruncate should not use fixed NN port. HDFS-9407. TestFileTruncate should not use fixed NN port.
(Brahma Reddy Battula via shv) (Brahma Reddy Battula via shv)
HDFS-9467. Fix data race accessing writeLockHeldTimeStamp in FSNamesystem.
(Mingliang Liu via jing9)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -1484,14 +1484,13 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
public void writeUnlock() { public void writeUnlock() {
final boolean needReport = fsLock.getWriteHoldCount() == 1 && final boolean needReport = fsLock.getWriteHoldCount() == 1 &&
fsLock.isWriteLockedByCurrentThread(); fsLock.isWriteLockedByCurrentThread();
final long writeLockInterval = monotonicNow() - writeLockHeldTimeStamp;
this.fsLock.writeLock().unlock(); this.fsLock.writeLock().unlock();
if (needReport) { if (needReport && writeLockInterval >= WRITELOCK_REPORTING_THRESHOLD) {
long writeLockInterval = monotonicNow() - writeLockHeldTimeStamp; LOG.info("FSNamesystem write lock held for " + writeLockInterval +
if (writeLockInterval >= WRITELOCK_REPORTING_THRESHOLD) { " ms via\n" + StringUtils.getStackTrace(Thread.currentThread()));
LOG.info("FSNamesystem write lock held for " + writeLockInterval +
" ms via\n" + StringUtils.getStackTrace(Thread.currentThread()));
}
} }
} }
@Override @Override