You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2009/03/11 22:27:20 UTC
svn commit: r752625 - in /hadoop/core/branches/branch-0.18: CHANGES.txt
src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java
src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java
Author: hairong
Date: Wed Mar 11 21:27:20 2009
New Revision: 752625
URL: http://svn.apache.org/viewvc?rev=752625&view=rev
Log:
Merge -r 752608:752609 to move the change of HADOOP-5412 from main to branch 0.18.
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=752625&r1=752624&r2=752625&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Wed Mar 11 21:27:20 2009
@@ -13,6 +13,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
Modified: hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java?rev=752625&r1=752624&r2=752625&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java (original)
+++ hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/SimulatedFSDataset.java Wed Mar 11 21:27:20 2009
@@ -270,7 +270,9 @@
}
public synchronized void unfinalizeBlock(Block b) throws IOException {
- blockMap.remove(b);
+ if (isBeingWritten(b)) {
+ blockMap.remove(b);
+ }
}
public synchronized Block[] getBlockReport() {
@@ -364,6 +366,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();
}
@@ -375,6 +386,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();
Modified: hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java?rev=752625&r1=752624&r2=752625&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java (original)
+++ hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/dfs/TestInjectionForSimulatedStorage.java Wed Mar 11 21:27:20 2009
@@ -166,7 +166,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) {