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

HDDS-678. Format of Last-Modified header is invalid in HEAD Object call. Contributed by Elek Marton.

Browse Source
This commit is contained in:
Bharat Viswanadham 2018-10-17 20:44:41 -07:00
parent 9146d33e18
commit 3ed7163302
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
View File

@ -34,6 +34,10 @@
import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.core.StreamingOutput;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -180,8 +184,13 @@ public Response head(
} }
} }
ZonedDateTime lastModificationTime =
Instant.ofEpochMilli(key.getModificationTime())
.atZone(ZoneId.of("GMT"));
return Response.ok().status(HttpStatus.SC_OK) return Response.ok().status(HttpStatus.SC_OK)
.header("Last-Modified", key.getModificationTime()) .header("Last-Modified",
DateTimeFormatter.RFC_1123_DATE_TIME.format(lastModificationTime))
.header("ETag", "" + key.getModificationTime()) .header("ETag", "" + key.getModificationTime())
.header("Content-Length", key.getDataSize()) .header("Content-Length", key.getDataSize())
.header("Content-Type", "binary/octet-stream") .header("Content-Type", "binary/octet-stream")

5
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java
View File

@ -21,6 +21,7 @@
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.io.IOException; import java.io.IOException;
import java.time.format.DateTimeFormatter;
import org.apache.hadoop.hdds.client.ReplicationFactor; import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType; import org.apache.hadoop.hdds.client.ReplicationType;
@ -80,6 +81,10 @@ public void testHeadObject() throws Exception {
Assert.assertEquals(200, response.getStatus()); Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(value.getBytes().length, Assert.assertEquals(value.getBytes().length,
Long.parseLong(response.getHeaderString("Content-Length"))); Long.parseLong(response.getHeaderString("Content-Length")));
DateTimeFormatter.RFC_1123_DATE_TIME
.parse(response.getHeaderString("Last-Modified"));
} }
@Test @Test