Prechádzať zdrojové kódy

HDDS-894. Content-length should be set for ozone s3 ranged download. Contributed by Elek Marton.

Bharat Viswanadham 6 rokov pred
rodič
commit
de4255509a

+ 8 - 3
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java

@@ -56,6 +56,7 @@ import org.apache.hadoop.ozone.web.utils.OzoneUtils;
 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 class ObjectEndpoint extends EndpointBase {
             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 class ObjectEndpoint extends EndpointBase {
                 copyLength);
           }
         };
-        responseBuilder = Response.ok(output);
+        responseBuilder = Response
+            .ok(output)
+            .header(CONTENT_LENGTH, copyLength);
 
         String contentRangeVal = RANGE_HEADER_SUPPORTED_UNIT + " " +
             rangeHeader.getStartOffset() + "-" + rangeHeader.getEndOffset() +

+ 2 - 0
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectGet.java

@@ -80,6 +80,8 @@ public class TestObjectGet {
         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"));