Author: hairong
Date: Wed Mar 11 21:01:32 2009
New Revision: 752610
URL: http://svn.apache.org/viewvc?rev=752610&view=rev
Log:
Merge -r 752608:752609 to move the change of HADOOP-5412 from main to brach
0.18.
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/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 11 21:01:32 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,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746902-746903,746944,746968,746970,747279,747802,748084,748090,748783,749262,749318,749863,750533,752073
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746902-746903,746944,746968,746970,747279,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=752610&r1=752609&r2=752610&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Mar 11 21:01:32 2009
@@ -1807,6 +1807,9 @@
HADOOP-5134. FSNamesystem#commitBlockSynchronization adds
under-construction
block locations to blocksMap. (Dhruba Borthakur via hairong)
+ HADOOP-5412. Simulated DataNode should not write to a block that's being
+ written by another thread. (hairong)
+
Release 0.18.3 - 2009-01-27
IMPROVEMENTS
Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 11 21:01:32 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,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746944,746968,746970,747279,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746944,746968,746970,747279,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609
Modified:
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java?rev=752610&r1=752609&r2=752610&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java
(original)
+++
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java
Wed Mar 11 21:01:32 2009
@@ -171,7 +171,7 @@
cluster = new MiniDFSCluster(0, conf, numDataNodes*2, false,
true, null, null);
-
+ cluster.waitActive();
Set<Block> uniqueBlocks = new HashSet<Block>();
for (int i=0; i<blocksList.length; ++i) {
for (int j=0; j < blocksList[i].length; ++j) {
Modified:
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java?rev=752610&r1=752609&r2=752610&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
(original)
+++
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
Wed Mar 11 21:01:32 2009
@@ -275,7 +275,9 @@
}
public synchronized void unfinalizeBlock(Block b) throws IOException {
- blockMap.remove(b);
+ if (isBeingWritten(b)) {
+ blockMap.remove(b);
+ }
}
public synchronized Block[] getBlockReport() {
@@ -365,6 +367,15 @@
return binfo.isFinalized();
}
+ /* check if a block is created but not finalized */
+ private synchronized boolean isBeingWritten(Block b) {
+ BInfo binfo = blockMap.get(b);
+ if (binfo == null) {
+ return false;
+ }
+ return !binfo.isFinalized();
+ }
+
public String toString() {
return getStorageInfo();
}
@@ -376,6 +387,10 @@
throw new BlockAlreadyExistsException("Block " + b +
" is valid, and cannot be written to.");
}
+ if (isBeingWritten(b)) {
+ throw new BlockAlreadyExistsException("Block " + b +
+ " is being written, and cannot be written to.");
+ }
BInfo binfo = new BInfo(b, true);
blockMap.put(b, binfo);
SimulatedOutputStream crcStream = new SimulatedOutputStream();
