Author: cutting Date: Thu Jun 21 14:49:23 2007 New Revision: 549624 URL: http://svn.apache.org/viewvc?view=rev&rev=549624 Log: HADOOP-1517. Remove some synchronization from namenode to permit finer grained locking previously added. Contributed by Konstantin.
Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=549624&r1=549623&r2=549624 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Thu Jun 21 14:49:23 2007 @@ -233,6 +233,9 @@ 71. HADOOP-1511. Speedup hbase unit tests. (stack via cutting) + 72. HADOOP-1517. Remove some synchronization in namenode to permit + finer grained locking previously added. (Konstantin Shvachko via cutting) + Release 0.13.0 - 2007-06-08 Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java?view=diff&rev=549624&r1=549623&r2=549624 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java Thu Jun 21 14:49:23 2007 @@ -596,13 +596,13 @@ * @throws IOException if the filename is invalid * [EMAIL PROTECTED] FSDirectory#isValidToCreate(String)}. */ - public synchronized LocatedBlock startFile(String src, - String holder, - String clientMachine, - boolean overwrite, - short replication, - long blockSize - ) throws IOException { + public LocatedBlock startFile(String src, + String holder, + String clientMachine, + boolean overwrite, + short replication, + long blockSize + ) throws IOException { // // Create file into pendingCreates and get the first blockId @@ -769,9 +769,9 @@ * are replicated. Will return an empty 2-elt array if we want the * client to "try again later". */ - public synchronized LocatedBlock getAdditionalBlock(String src, - String clientName - ) throws IOException { + public LocatedBlock getAdditionalBlock(String src, + String clientName + ) throws IOException { long fileLength, blockSize; int replication; DatanodeDescriptor clientNode = null; @@ -973,7 +973,7 @@ /** * Allocate a block at the given pending filename */ - synchronized Block allocateBlock(String src) throws IOException { + private Block allocateBlock(String src) throws IOException { Block b = null; do { b = new Block(FSNamesystem.randBlockId.nextLong(), 0);