Skip to content

HDDS-15179. Support Chunked Transfer without Content Length #10196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterxcli wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −0
Open

HDDS-15179. Support Chunked Transfer without Content Length #10196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import static org.apache.hadoop.ozone.s3.util.S3Utils.wrapInQuotes;

import com.google.common.collect.ImmutableMap;
import com.google.common.io.FileBackedOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -198,12 +199,18 @@ Response handlePutRequest(ObjectRequestContext context, String keyPath, InputStr
final long startNanos = context.getStartNanos();

String copyHeader = null;
FileBackedOutputStream spooledBody = null;
MultiDigestInputStream multiDigestInputStream = null;
try {
OzoneVolume volume = context.getVolume();
OzoneBucket bucket = context.getBucket();
final String lengthHeader = getHeaders().getHeaderString(HttpHeaders.CONTENT_LENGTH);
long length = lengthHeader != null ? Long.parseLong(lengthHeader) : 0;
if (lengthHeader == null && body != null) {
spooledBody = new FileBackedOutputStream(getIOBufferSize(1));
length = IOUtils.copyLarge(body, spooledBody);
body = spooledBody.asByteSource().openStream();
}

if (uploadID != null && !uploadID.equals("")) {
if (getHeaders().getHeaderString(COPY_SOURCE_HEADER) == null) {
Expand Down Expand Up @@ -343,6 +350,9 @@ customMetadata, tags, multiDigestInputStream, getHeaders(),
if (multiDigestInputStream != null) {
multiDigestInputStream.resetDigests();
}
if (spooledBody != null) {
spooledBody.reset();
}
}
}

Expand Down
24 changes: 24 additions & 0 deletions hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectPut.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import static org.mockito.Mockito.when;

import com.google.common.collect.ImmutableMap;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand All @@ -63,10 +64,12 @@
import java.util.Base64;
import java.util.Map;
import java.util.stream.Stream;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.xml.bind.DatatypeConverter;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -246,6 +249,21 @@ void testPutObjectWithSignedChunks() throws Exception {
assertEquals(15, keyDetails.getDataSize());
}

@Test
void testPutObjectWithChunkedTransferEncoding() throws Exception {
when(objectEndpoint.getContext().getMethod()).thenReturn(HttpMethod.PUT);
when(headers.getHeaderString(HttpHeaders.CONTENT_LENGTH)).thenReturn(null);
when(headers.getHeaderString("Transfer-Encoding")).thenReturn("chunked");
when(headers.getHeaderString(X_AMZ_CONTENT_SHA256)).thenReturn(sha256Hex(CONTENT));

try (InputStream body = new ByteArrayInputStream(CONTENT.getBytes(StandardCharsets.UTF_8))) {
assertSucceeds(() -> objectEndpoint.put(BUCKET_NAME, KEY_NAME, body));
}

OzoneKeyDetails keyDetails = assertKeyContent(bucket, KEY_NAME, CONTENT);
assertEquals(CONTENT.length(), keyDetails.getDataSize());
}

@Test
public void testPutObjectMessageDigestResetDuringException() {
MessageDigest messageDigest = mock(MessageDigest.class);
Expand Down Expand Up @@ -672,4 +690,10 @@ private Response putObject(String bucketName, String keyName) throws IOException
private Response putObject(String content) throws IOException, OS3Exception {
return put(objectEndpoint, BUCKET_NAME, KEY_NAME, content);
}

private static String sha256Hex(String content) throws NoSuchAlgorithmException {
MessageDigest digest = MessageDigest.getInstance(OzoneConsts.FILE_HASH);
byte[] contentDigest = digest.digest(content.getBytes(StandardCharsets.UTF_8));
return DatatypeConverter.printHexBinary(contentDigest).toLowerCase();
}
}