You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by da...@apache.org on 2013/12/05 16:28:12 UTC
svn commit: r1548161 - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java
Author: daryn
Date: Thu Dec 5 15:28:12 2013
New Revision: 1548161
URL: http://svn.apache.org/r1548161
Log:
HDFS-5514. FSNamesystem's fsLock should allow custom implementation (daryn)
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1548161&r1=1548160&r2=1548161&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Dec 5 15:28:12 2013
@@ -457,6 +457,8 @@ Release 2.4.0 - UNRELEASED
HDFS-5444. Choose default web UI based on browser capabilities. (Haohui Mai
via jing9)
+ HDFS-5514. FSNamesystem's fsLock should allow custom implementation (daryn)
+
IMPROVEMENTS
HDFS-5267. Remove volatile from LightWeightHashSet. (Junping Du via llu)
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1548161&r1=1548160&r2=1548161&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Thu Dec 5 15:28:12 2013
@@ -467,7 +467,7 @@ public class FSNamesystem implements Nam
private final long accessTimePrecision;
/** Lock to protect FSNamesystem. */
- private ReentrantReadWriteLock fsLock;
+ private FSNamesystemLock fsLock;
/**
* Used when this NN is in standby state to read from the shared edit log.
@@ -650,7 +650,7 @@ public class FSNamesystem implements Nam
throws IOException {
boolean fair = conf.getBoolean("dfs.namenode.fslock.fair", true);
LOG.info("fsLock is fair:" + fair);
- fsLock = new ReentrantReadWriteLock(fair);
+ fsLock = new FSNamesystemLock(fair);
try {
resourceRecheckInterval = conf.getLong(
DFS_NAMENODE_RESOURCE_CHECK_INTERVAL_KEY,
@@ -6771,12 +6771,12 @@ public class FSNamesystem implements Nam
@VisibleForTesting
void setFsLockForTests(ReentrantReadWriteLock lock) {
- this.fsLock = lock;
+ this.fsLock.coarseLock = lock;
}
@VisibleForTesting
ReentrantReadWriteLock getFsLockForTests() {
- return fsLock;
+ return fsLock.coarseLock;
}
@VisibleForTesting
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java?rev=1548161&r1=1548160&r2=1548161&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java Thu Dec 5 15:28:12 2013
@@ -158,4 +158,40 @@ public class TestFSNamesystem {
fsNamesystem = new FSNamesystem(conf, fsImage);
assertFalse(fsNamesystem.getFsLockForTests().isFair());
}
+
+ @Test
+ public void testFSNamesystemLockCompatibility() {
+ FSNamesystemLock rwLock = new FSNamesystemLock(true);
+
+ assertEquals(0, rwLock.getReadHoldCount());
+ rwLock.readLock().lock();
+ assertEquals(1, rwLock.getReadHoldCount());
+
+ rwLock.readLock().lock();
+ assertEquals(2, rwLock.getReadHoldCount());
+
+ rwLock.readLock().unlock();
+ assertEquals(1, rwLock.getReadHoldCount());
+
+ rwLock.readLock().unlock();
+ assertEquals(0, rwLock.getReadHoldCount());
+
+ assertFalse(rwLock.isWriteLockedByCurrentThread());
+ assertEquals(0, rwLock.getWriteHoldCount());
+ rwLock.writeLock().lock();
+ assertTrue(rwLock.isWriteLockedByCurrentThread());
+ assertEquals(1, rwLock.getWriteHoldCount());
+
+ rwLock.writeLock().lock();
+ assertTrue(rwLock.isWriteLockedByCurrentThread());
+ assertEquals(2, rwLock.getWriteHoldCount());
+
+ rwLock.writeLock().unlock();
+ assertTrue(rwLock.isWriteLockedByCurrentThread());
+ assertEquals(1, rwLock.getWriteHoldCount());
+
+ rwLock.writeLock().unlock();
+ assertFalse(rwLock.isWriteLockedByCurrentThread());
+ assertEquals(0, rwLock.getWriteHoldCount());
+ }
}