Repository: hadoop Updated Branches: refs/heads/branch-2 5d897026e -> 215216abe
HDFS-6799. The invalidate method in SimulatedFSDataset failed to remove (invalidate) blocks from the file system. Contributed by Megasthenis Asteris. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/215216ab Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/215216ab Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/215216ab Branch: refs/heads/branch-2 Commit: 215216abeb657de2d0ac8df52e7af5c4a04ba8cb Parents: 5d89702 Author: Benoy Antony <[email protected]> Authored: Tue Sep 16 16:24:23 2014 -0700 Committer: Benoy Antony <[email protected]> Committed: Tue Sep 16 16:27:25 2014 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/datanode/SimulatedFSDataset.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/215216ab/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java index 8ad4510..d0fad6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java @@ -482,9 +482,10 @@ public class SimulatedFSDataset implements FsDatasetSpi<FsVolumeSpi> { } @Override // FsDatasetSpi - public synchronized void unfinalizeBlock(ExtendedBlock b) { + public synchronized void unfinalizeBlock(ExtendedBlock b) throws IOException{ if (isValidRbw(b)) { - blockMap.remove(b.getLocalBlock()); + final Map<Block, BInfo> map = getMap(b.getBlockPoolId()); + map.remove(b.getLocalBlock()); } } @@ -624,7 +625,7 @@ public class SimulatedFSDataset implements FsDatasetSpi<FsVolumeSpi> { continue; } storage.free(bpid, binfo.getNumBytes()); - blockMap.remove(b); + map.remove(b); } if (error) { throw new IOException("Invalidate: Missing blocks.");
