big-data/hadoop
big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

HDFS-9516. Truncate file fails with data dirs on multiple disks. Contributed by Plamen Jeliazkov.

Browse Source
This commit is contained in:
Plamen Jeliazkov 2015-12-15 00:10:33 -08:00 committed by Konstantin V Shvachko
parent 2aaed10327
commit 96d307e1e3
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -903,6 +903,9 @@ Release 2.9.0 - UNRELEASED
BUG FIXES BUG FIXES
HDFS-9516. Truncate file fails with data dirs on multiple disks.
(Plamen Jeliazkov via shv)
Release 2.8.0 - UNRELEASED Release 2.8.0 - UNRELEASED
NEW FEATURES NEW FEATURES

27
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
View File

@ -2500,8 +2500,14 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
} else { } else {
// Copying block to a new block with new blockId. // Copying block to a new block with new blockId.
// Not truncating original block. // 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( ReplicaBeingWritten newReplicaInfo = new ReplicaBeingWritten(
newBlockId, recoveryId, rur.getVolume(), blockFile.getParentFile(), newBlockId, recoveryId, volume, blockFile.getParentFile(),
newlength); newlength);
newReplicaInfo.setNumBytes(newlength); newReplicaInfo.setNumBytes(newlength);
volumeMap.add(bpid, newReplicaInfo); volumeMap.add(bpid, newReplicaInfo);
@ -2517,17 +2523,14 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
ReplicaUnderRecovery replicaInfo, String bpid, long newBlkId, long newGS) ReplicaUnderRecovery replicaInfo, String bpid, long newBlkId, long newGS)
throws IOException { throws IOException {
String blockFileName = Block.BLOCK_FILE_PREFIX + newBlkId; String blockFileName = Block.BLOCK_FILE_PREFIX + newBlkId;
try (FsVolumeReference ref = volumes.getNextVolume( FsVolumeImpl v = (FsVolumeImpl) replicaInfo.getVolume();
replicaInfo.getVolume().getStorageType(), replicaInfo.getNumBytes())) { final File tmpDir = v.getBlockPoolSlice(bpid).getTmpDir();
FsVolumeImpl v = (FsVolumeImpl) ref.getVolume(); final File destDir = DatanodeUtil.idToBlockDir(tmpDir, newBlkId);
final File tmpDir = v.getBlockPoolSlice(bpid).getTmpDir(); final File dstBlockFile = new File(destDir, blockFileName);
final File destDir = DatanodeUtil.idToBlockDir(tmpDir, newBlkId); final File dstMetaFile = FsDatasetUtil.getMetaFile(dstBlockFile, newGS);
final File dstBlockFile = new File(destDir, blockFileName); return copyBlockFiles(replicaInfo.getMetaFile(),
final File dstMetaFile = FsDatasetUtil.getMetaFile(dstBlockFile, newGS); replicaInfo.getBlockFile(),
return copyBlockFiles(replicaInfo.getMetaFile(), dstMetaFile, dstBlockFile, true, smallBufferSize, conf);
replicaInfo.getBlockFile(),
dstMetaFile, dstBlockFile, true, smallBufferSize, conf);
}
} }
@Override // FsDatasetSpi @Override // FsDatasetSpi