Author: hairong
Date: Tue Feb 17 18:16:18 2009
New Revision: 745180
URL: http://svn.apache.org/viewvc?rev=745180&view=rev
Log:
HADOOP-5134. FSNamesystem#commitBlockSynchronization adds under-construction
block locations to blocksMap. Contributed by Dhruba Borthakur.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=745180&r1=745179&r2=745180&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Feb 17 18:16:18 2009
@@ -1859,6 +1859,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
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=745180&r1=745179&r2=745180&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Tue Feb 17 18:16:18 2009
@@ -1124,7 +1124,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) {
@@ -1137,6 +1137,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());
@@ -1835,7 +1842,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");
@@ -1848,6 +1858,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);
@@ -1859,22 +1870,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);
@@ -1887,6 +1909,7 @@
finalizeINodeFileUnderConstruction(src, pendingFile);
getEditLog().logSync();
LOG.info("commitBlockSynchronization(newblock=" + lastblock
+ + ", file=" + src
+ ", newgenerationstamp=" + newgenerationstamp
+ ", newlength=" + newlength
+ ", newtargets=" + Arrays.asList(newtargets) + ") successful");
