HDFS-9516. Truncate file fails with data dirs on multiple disks. Contributed by Plamen Jeliazkov.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cffa262f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cffa262f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cffa262f Branch: refs/heads/branch-2.8 Commit: cffa262f116609bc316cc3c70b668a8394c4c25e Parents: e6dc6f2 Author: Plamen Jeliazkov <plamenj2...@gmail.com> Authored: Tue Dec 15 00:10:33 2015 -0800 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Thu Dec 17 00:03:51 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../server/datanode/fsdataset/impl/FsDatasetImpl.java | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cffa262f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 9b5e7bb..b4d5a8b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1611,6 +1611,9 @@ Release 2.7.3 - UNRELEASED HDFS-8785. TestDistributedFileSystem is failing in trunk. (Xiaoyu Yao) + HDFS-9516. Truncate file fails with data dirs on multiple disks. + (Plamen Jeliazkov via shv) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/cffa262f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java index 8fb06bf..0fabf92 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java @@ -2505,8 +2505,14 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> { } else { // Copying block to a new block with new blockId. // Not truncating original block. + FsVolumeSpi volume = rur.getVolume(); + String blockPath = blockFile.getAbsolutePath(); + String volumePath = volume.getBasePath(); + assert blockPath.startsWith(volumePath) : + "New block file: " + blockPath + " must be on " + + "same volume as recovery replica: " + volumePath; ReplicaBeingWritten newReplicaInfo = new ReplicaBeingWritten( - newBlockId, recoveryId, rur.getVolume(), blockFile.getParentFile(), + newBlockId, recoveryId, volume, blockFile.getParentFile(), newlength); newReplicaInfo.setNumBytes(newlength); volumeMap.add(bpid, newReplicaInfo); @@ -2522,10 +2528,8 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> { ReplicaUnderRecovery replicaInfo, String bpid, long newBlkId, long newGS) throws IOException { String blockFileName = Block.BLOCK_FILE_PREFIX + newBlkId; - FsVolumeReference v = volumes.getNextVolume( - replicaInfo.getVolume().getStorageType(), replicaInfo.getNumBytes()); - final File tmpDir = ((FsVolumeImpl) v.getVolume()) - .getBlockPoolSlice(bpid).getTmpDir(); + FsVolumeImpl v = (FsVolumeImpl) replicaInfo.getVolume(); + final File tmpDir = v.getBlockPoolSlice(bpid).getTmpDir(); final File destDir = DatanodeUtil.idToBlockDir(tmpDir, newBlkId); final File dstBlockFile = new File(destDir, blockFileName); final File dstMetaFile = FsDatasetUtil.getMetaFile(dstBlockFile, newGS);
