diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java index c504387a05f..fdcadfc56c7 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java @@ -56,6 +56,7 @@ import org.apache.hadoop.util.Time; import com.google.common.annotations.VisibleForTesting; +import static javax.ws.rs.core.HttpHeaders.CONTENT_LENGTH; import static javax.ws.rs.core.HttpHeaders.LAST_MODIFIED; import org.apache.commons.io.IOUtils; import static org.apache.hadoop.ozone.s3.util.S3Consts.ACCEPT_RANGE_HEADER; @@ -204,10 +205,12 @@ public Response get( IOUtils.copy(key, dest); } }; - responseBuilder = Response.ok(output); + responseBuilder = Response + .ok(output) + .header(CONTENT_LENGTH, keyDetails.getDataSize()); } else { - LOG.info("range Header provided value is {}", rangeHeader); + LOG.debug("range Header provided value is {}", rangeHeader); OzoneInputStream key = bucket.readKey(keyPath); long startOffset = rangeHeader.getStartOffset(); @@ -229,7 +232,9 @@ public Response get( copyLength); } }; - responseBuilder = Response.ok(output); + responseBuilder = Response + .ok(output) + .header(CONTENT_LENGTH, copyLength); String contentRangeVal = RANGE_HEADER_SUPPORTED_UNIT + " " + rangeHeader.getStartOffset() + "-" + rangeHeader.getEndOffset() + diff --git a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java index f9df9aa6535..2455322e60b 100644 --- a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java +++ b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java @@ -80,6 +80,8 @@ public void get() throws IOException, OS3Exception { IOUtils.toString(ozoneInputStream, Charset.forName("UTF-8")); Assert.assertEquals(CONTENT, keyContent); + Assert.assertEquals("" + keyContent.length(), + response.getHeaderString("Content-Length")); DateTimeFormatter.RFC_1123_DATE_TIME .parse(response.getHeaderString("Last-Modified"));