Author: hairong
Date: Tue Feb 17 18:18:42 2009
New Revision: 745181
URL: http://svn.apache.org/viewvc?rev=745181&view=rev
Log:
Merge -r 745179:745180 from trunk to move the change of HADOOP-5134 to branch
0.20.
Modified:
hadoop/core/branches/branch-0.20/ (props changed)
hadoop/core/branches/branch-0.20/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 18:18:42 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=745181&r1=745180&r2=745181&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Tue Feb 17 18:18:42 2009
@@ -1681,6 +1681,9 @@
HADOOP-5192. Block receiver should not remove a block that's created or
being written by other threads. (hairong)
+ HADOOP-5134. FSNamesystem#commitBlockSynchronization adds
under-construction
+ block locations to blocksMap. (Dhruba Borthakur via hairong)
+
Release 0.18.3 - 2009-01-27
IMPROVEMENTS
Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 18:18:42 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180
Modified:
hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=745181&r1=745180&r2=745181&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/core/branches/branch-0.20/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Tue Feb 17 18:18:42 2009
@@ -1127,7 +1127,7 @@
//
LocatedBlock lb = null;
synchronized (this) {
- INodeFile file = dir.getFileINode(src);
+ INodeFileUnderConstruction file =
(INodeFileUnderConstruction)dir.getFileINode(src);
Block[] blocks = file.getBlocks();
if (blocks != null && blocks.length > 0) {
@@ -1140,6 +1140,13 @@
for (int i = 0; it != null && it.hasNext(); i++) {
targets[i] = it.next();
}
+ // remove the replica locations of this block from the blocksMap
+ for (int i = 0; i < targets.length; i++) {
+ targets[i].removeBlock(storedBlock);
+ }
+ // set the locations of the last block in the lease record
+ file.setLastBlock(storedBlock, targets);
+
lb = new LocatedBlock(last, targets,
fileLength-storedBlock.getNumBytes());
@@ -1834,7 +1841,10 @@
LOG.info("commitBlockSynchronization(lastblock=" + lastblock
+ ", newgenerationstamp=" + newgenerationstamp
+ ", newlength=" + newlength
- + ", newtargets=" + Arrays.asList(newtargets) + ")");
+ + ", newtargets=" + Arrays.asList(newtargets)
+ + ", closeFile=" + closeFile
+ + ", deleteBlock=" + deleteblock
+ + ")");
final BlockInfo oldblockinfo = blocksMap.getStoredBlock(lastblock);
if (oldblockinfo == null) {
throw new IOException("Block (=" + lastblock + ") not found");
@@ -1847,6 +1857,7 @@
}
INodeFileUnderConstruction pendingFile = (INodeFileUnderConstruction)iFile;
+
// Remove old block from blocks map. This always have to be done
// because the generation stamp of this block is changing.
blocksMap.removeBlock(oldblockinfo);
@@ -1858,22 +1869,33 @@
// update last block, construct newblockinfo and add it to the blocks map
lastblock.set(lastblock.getBlockId(), newlength, newgenerationstamp);
final BlockInfo newblockinfo = blocksMap.addINode(lastblock,
pendingFile);
-
- //update block info
+
+ // find the DatanodeDescriptor objects
+ // There should be no locations in the blocksMap till now because the
+ // file is underConstruction
DatanodeDescriptor[] descriptors = null;
if (newtargets.length > 0) {
descriptors = new DatanodeDescriptor[newtargets.length];
for(int i = 0; i < newtargets.length; i++) {
descriptors[i] = getDatanode(newtargets[i]);
+ }
+ }
+ if (closeFile) {
+ // the file is getting closed. Insert block locations into blocksMap.
+ // Otherwise fsck will report these blocks as MISSING, especially if
the
+ // blocksReceived from Datanodes take a long time to arrive.
+ for (int i = 0; i < descriptors.length; i++) {
descriptors[i].addBlock(newblockinfo);
}
+ pendingFile.setLastBlock(newblockinfo, null);
+ } else {
+ // add locations into the INodeUnderConstruction
+ pendingFile.setLastBlock(newblockinfo, descriptors);
}
-
- pendingFile.setLastBlock(newblockinfo, descriptors);
}
// If this commit does not want to close the file, just persist
- // block locations and return
+ // blocks and return
String src = leaseManager.findPath(pendingFile);
if (!closeFile) {
dir.persistBlocks(src, pendingFile);
@@ -1886,6 +1908,7 @@
finalizeINodeFileUnderConstruction(src, pendingFile);
getEditLog().logSync();
LOG.info("commitBlockSynchronization(newblock=" + lastblock
+ + ", file=" + src
+ ", newgenerationstamp=" + newgenerationstamp
+ ", newlength=" + newlength
+ ", newtargets=" + Arrays.asList(newtargets) + ") successful");
