Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-13936. Multipart upload to HDFS to support 0 byte upload. Contributed by Ewan Higgs.

This commit is contained in:
Ewan Higgs 2018-10-02 14:03:28 +02:00
parent a383ac47ca
commit 6fab6886f6
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystemMultipartUploader.java
View File

@ -100,6 +100,14 @@ private PathHandle getPathHandle(Path filePath) throws IOException {
return fs.getPathHandle(status); return fs.getPathHandle(status);
} }
private long totalPartsLen(List<Path> partHandles) throws IOException {
long totalLen = 0;
for (Path p: partHandles) {
totalLen += fs.getFileStatus(p).getLen();
}
return totalLen;
}
@Override @Override
@SuppressWarnings("deprecation") // rename w/ OVERWRITE @SuppressWarnings("deprecation") // rename w/ OVERWRITE
public PathHandle complete(Path filePath, public PathHandle complete(Path filePath,
@ -127,12 +135,17 @@ public PathHandle complete(Path filePath,
.collect(Collectors.toList()); .collect(Collectors.toList());
Path collectorPath = createCollectorPath(filePath); Path collectorPath = createCollectorPath(filePath);
Path filePathInsideCollector = mergePaths(collectorPath, boolean emptyFile = totalPartsLen(partHandles) == 0;
new Path(Path.SEPARATOR + filePath.getName())); if (emptyFile) {
fs.create(filePathInsideCollector).close(); fs.create(filePath).close();
fs.concat(filePathInsideCollector, } else {
partHandles.toArray(new Path[handles.size()])); Path filePathInsideCollector = mergePaths(collectorPath,
fs.rename(filePathInsideCollector, filePath, Options.Rename.OVERWRITE); new Path(Path.SEPARATOR + filePath.getName()));
fs.create(filePathInsideCollector).close();
fs.concat(filePathInsideCollector,
partHandles.toArray(new Path[handles.size()]));
fs.rename(filePathInsideCollector, filePath, Options.Rename.OVERWRITE);
}
fs.delete(collectorPath, true); fs.delete(collectorPath, true);
return getPathHandle(filePath); return getPathHandle(filePath);
} }

22
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java
View File

@ -164,6 +164,28 @@ public void testMultipartUpload() throws Exception {
payloadCount * partSizeInBytes()); payloadCount * partSizeInBytes());
} }
/**
* Assert that a multipart upload is successful when a single empty part is
* uploaded.
* @throws Exception failure
*/
@Test
public void testMultipartUploadEmptyPart() throws Exception {
FileSystem fs = getFileSystem();
Path file = path("testMultipartUpload");
MultipartUploader mpu = MultipartUploaderFactory.get(fs, null);
UploadHandle uploadHandle = mpu.initialize(file);
List<Pair<Integer, PartHandle>> partHandles = new ArrayList<>();
MessageDigest origDigest = DigestUtils.getMd5Digest();
byte[] payload = new byte[0];
origDigest.update(payload);
InputStream is = new ByteArrayInputStream(payload);
PartHandle partHandle = mpu.putPart(file, is, 0, uploadHandle,
payload.length);
partHandles.add(Pair.of(0, partHandle));
completeUpload(file, mpu, uploadHandle, partHandles, origDigest, 0);
}
/** /**
* Assert that a multipart upload is successful even when the parts are * Assert that a multipart upload is successful even when the parts are
* given in the reverse order. * given in the reverse order.